From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 24 Oct 2011 22:27:00 +0000 (+0300)
Subject: Don't consider grabbing a cheat if sandbox mode is enabled
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~198
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4a850b012b05774ec7bea9c53c5cbed0bf9bab4e;p=xonotic%2Fxonotic-data.pk3dir.git

Don't consider grabbing a cheat if sandbox mode is enabled
---

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index ec2b661c3..500a36ebe 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -685,11 +685,18 @@ float CheatFrame()
 	switch(0)
 	{
 		default:
-			if(self.BUTTON_DRAG)
+			if(self.BUTTON_DRAG && !cvar("g_sandbox"))
+			{
+				// consider dragging a cheat only if sandbox mode is disabled
 				IS_CHEAT(0, 0, CHRAME_DRAG);
-			crosshair_trace_plusvisibletriggers(self);
-			if(Drag(trace_ent))
-				DID_CHEAT();
+			}
+			if(autocvar_sv_cheats)
+			{
+				// only use non-sandbox dragging if cheats are enabled
+				crosshair_trace_plusvisibletriggers(self);
+				if(Drag(trace_ent) && !cvar("g_sandbox"))
+					DID_CHEAT();
+			}
 			break;
 	}
 
diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh
index 8c276919c..c9a449b53 100644
--- a/qcsrc/server/cheats.qh
+++ b/qcsrc/server/cheats.qh
@@ -11,3 +11,5 @@ float CheatCommand(float argc);
 float CheatFrame();
 
 void Drag_MoveDrag(entity from, entity to); // call this from CopyBody
+
+float Drag(entity e); // used by sandbox code
\ No newline at end of file