From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 4 Dec 2011 15:59:10 +0000 (+0100)
Subject: fix multiple bugs in sandbox code regarding sv_cheats
X-Git-Tag: xonotic-v0.6.0~35^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12e90348bf3dcdf2feb0753b440f050e23abfb6b;p=xonotic%2Fxonotic-data.pk3dir.git

fix multiple bugs in sandbox code regarding sv_cheats
---

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index d2a21edc1..c03ea7ae0 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -664,7 +664,7 @@ float CheatCommand(float argc)
 	END_CHEAT_FUNCTION();
 }
 
-float Drag(entity e, float grab);
+float Drag(entity e, float grab, float ischeat);
 void Drag_Begin(entity dragger, entity draggee, vector touchpoint);
 void Drag_Finish(entity dragger);
 float Drag_IsDraggable(entity draggee);
@@ -690,13 +690,11 @@ float CheatFrame()
 	switch(0)
 	{
 		default:
-			if(autocvar_sv_cheats)
+			if(self.maycheat || (gamestart_sv_cheats && autocvar_sv_cheats))
 			{
 				// use cheat dragging if cheats are enabled
-				IS_CHEAT(0, 0, CHRAME_DRAG);
 				crosshair_trace_plusvisibletriggers(self);
-				if(Drag(trace_ent, TRUE))
-					DID_CHEAT();
+				Drag(trace_ent, TRUE, TRUE);
 			}
 			else
 			{
@@ -726,7 +724,7 @@ float CheatFrame()
 					default:
 						break;
 				}
-				Drag(trace_ent, drag); // execute dragging
+				Drag(trace_ent, drag, FALSE); // execute dragging
 			}
 			break;
 	}
@@ -740,59 +738,70 @@ float CheatFrame()
 
 // ENTITY DRAGGING
 
-float Drag(entity e, float pick)
+float Drag(entity e, float pick, float ischeat)
 {
+	BEGIN_CHEAT_FUNCTION();
+
 	// returns TRUE when an entity has been picked up
 	// If pick is TRUE, the object can also be picked up if it's not being held already
 	// If pick is FALSE, only keep dragging the object if it's already being held
 
-	if(Drag_IsDragging(self))
+	switch(0)
 	{
-		if(self.BUTTON_DRAG)
-		{
-			if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18)
-			{
-				Drag_MoveForward(self);
-				self.impulse = 0;
-			}
-			else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19)
-			{
-				Drag_MoveBackward(self);
-				self.impulse = 0;
-			}
-			else if(self.impulse >= 1 && self.impulse <= 9)
-			{
-				Drag_SetSpeed(self, self.impulse - 1);
-			}
-			else if(self.impulse == 14)
+		default:
+			if(Drag_IsDragging(self))
 			{
-				Drag_SetSpeed(self, 9);
-			}
+				if(self.BUTTON_DRAG)
+				{
+					if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18)
+					{
+						Drag_MoveForward(self);
+						self.impulse = 0;
+					}
+					else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19)
+					{
+						Drag_MoveBackward(self);
+						self.impulse = 0;
+					}
+					else if(self.impulse >= 1 && self.impulse <= 9)
+					{
+						Drag_SetSpeed(self, self.impulse - 1);
+					}
+					else if(self.impulse == 14)
+					{
+						Drag_SetSpeed(self, 9);
+					}
 
-			if(frametime)
-				Drag_Update(self);
-		}
-		else
-		{
-			Drag_Finish(self);
-		}
-	}
-	else
-	{
-		if(Drag_CanDrag(self))
-			if(self.BUTTON_DRAG && pick)
+					if(frametime)
+						Drag_Update(self);
+				}
+				else
+				{
+					Drag_Finish(self);
+				}
+			}
+			else
 			{
-				if(e)
-					if(Drag_IsDraggable(e))
+				if(Drag_CanDrag(self))
+					if(self.BUTTON_DRAG && pick)
 					{
-							if(e.draggedby)
-								Drag_Finish(e.draggedby);
-							if(e.tag_entity)
-								detach_sameorigin(e);
-							Drag_Begin(self, e, trace_endpos);
-							return TRUE;
+						if(e)
+							if(Drag_IsDraggable(e))
+							{
+								if(ischeat)
+									IS_CHEAT(0, 0, CHRAME_DRAG);
+								if(e.draggedby)
+									Drag_Finish(e.draggedby);
+								if(e.tag_entity)
+									detach_sameorigin(e);
+								Drag_Begin(self, e, trace_endpos);
+								if(ischeat)
+									DID_CHEAT();
+								return TRUE;
+							}
 					}
 			}
+			break;
 	}
 	return FALSE;
 }
diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh
index 46152692e..8c276919c 100644
--- a/qcsrc/server/cheats.qh
+++ b/qcsrc/server/cheats.qh
@@ -11,5 +11,3 @@ float CheatCommand(float argc);
 float CheatFrame();
 
 void Drag_MoveDrag(entity from, entity to); // call this from CopyBody
-
-float Drag(entity e, float grab); // used by sandbox code
\ No newline at end of file