X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=81b34efa696727ab23c6941acad073877124831f;hb=459025727460dcd55b9b90b03acbaff163cd3a57;hp=746a22d8940c622f1ffbb7e51060b082886d3c89;hpb=fcbf9538330960b989dbe84e7188349d7e8b109f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 746a22d89..81b34efa6 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -48,7 +48,7 @@ float CheatsAllowed(float i, float argc, float fr) // the cheat gets passed as a
 	// dead people cannot cheat
 	if(self.deadflag != DEAD_NO)
 		return 0;
-	if(gamestart_sv_cheats < 2 && self.classname != "player")
+	if(gamestart_sv_cheats < 2 && !IS_PLAYER(self))
 		return 0;
 	
 	// sv_clones
@@ -264,7 +264,7 @@ float CheatImpulse(float i)
 
 			e2 = spawn();
 			setorigin(e2, e.origin);
-			RadiusDamage(e2, self, 1000, 0, 128, world, 500, DEATH_CHEAT, e);
+			RadiusDamage(e2, self, 1000, 0, 128, world, world, 500, DEATH_CHEAT, e);
 			remove(e2);
 
 			print("404 Sportsmanship not found.\n");
@@ -943,9 +943,9 @@ float Drag_IsDraggable(entity draggee)
 		return FALSE;
 //	if(draggee.model == "")
 //		return FALSE;
-	if(draggee.classname == "spectator")
+	if(IS_SPEC(draggee))
 		return FALSE;
-	if(draggee.classname == "observer")
+	if(IS_OBSERVER(draggee))
 		return FALSE;
 	if(draggee.classname == "exteriorweaponentity")
 		return FALSE;
@@ -1011,7 +1011,7 @@ void Drag_Update(entity dragger)
 
 float Drag_CanDrag(entity dragger)
 {
-	return (dragger.deadflag == DEAD_NO) || (dragger.classname == "player");
+	return (dragger.deadflag == DEAD_NO) || (IS_PLAYER(dragger));
 }
 
 float Drag_IsDragging(entity dragger)