From: Samual <samual@xonotic.org>
Date: Tue, 16 Aug 2011 21:01:38 +0000 (-0400)
Subject: Make it so +use works in reverse too (clipped if pressed when noclip is preference)
X-Git-Tag: xonotic-v0.5.0~109^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac1212dd853609b77ce6790a9b0d15e33aaf0870;p=xonotic%2Fxonotic-data.pk3dir.git

Make it so +use works in reverse too (clipped if pressed when noclip is preference)
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 8d096b21e..34534b74c 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2514,7 +2514,7 @@ void ObserverThink()
 				self.classname = "spectator";
 			}
 		} else {
-			prefered_movetype = ((self.cvar_cl_clippedspectating && !self.BUTTON_USE) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);
+			prefered_movetype = ((!self.BUTTON_USE ? self.cvar_cl_clippedspectating : !self.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);
 			if (self.movetype != prefered_movetype)
 				self.movetype = prefered_movetype;
 		}