X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=26af000d2d52f0d5bcc4a1050c235585a1d883c5;hb=8da45596c76bb645e864b4ec8ff5a3ee13bbf27c;hp=5e2586cd60598f5c93977aa53786c1897425e20d;hpb=802d673ea15260b02ce6760839cc40a2a57b21b1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 5e2586cd6..26af000d2 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -11,7 +11,7 @@
 
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
-#include "../common/effects.qh"
+#include "../common/effects/effects.qh"
 #include "../common/util.qh"
 
 #include "../common/monsters/all.qh"
@@ -372,8 +372,7 @@ float CheatCommand(float argc)
 						e.angles = fixedvectoangles2(trace_plane_normal, v_forward);
 						e.angles = AnglesTransform_ApplyToAngles(e.angles, '-90 0 0'); // so unrotated models work
 					}
-					SELFCALL(e, spawnfunc_func_breakable());
-					SELFCALL_DONE();
+					WITH(entity, self, e, spawnfunc_func_breakable());
 					// now, is it valid?
 					if(f == 0)
 					{
@@ -410,7 +409,7 @@ float CheatCommand(float argc)
 			e.think = DragBox_Think;
 			e.nextthink = time;
 			e.solid = -1; // black
-			setmodel(e, "null"); // network it
+			setmodel(e, MDL_Null); // network it
 			if(argc == 4)
 				e.cnt = stof(argv(1));
 			else
@@ -419,7 +418,7 @@ float CheatCommand(float argc)
 			e.aiment = spawn();
 			e.aiment.classname = "dragbox_corner_1";
 			e.aiment.owner = e;
-			setmodel(e.aiment, "models/marker.md3");
+			setmodel(e.aiment, MDL_MARKER);
 			e.aiment.skin = 0;
 			setsize(e.aiment, '0 0 0', '0 0 0');
 			if(argc == 4)
@@ -433,7 +432,7 @@ float CheatCommand(float argc)
 			e.enemy = spawn();
 			e.enemy.classname = "dragbox_corner_2";
 			e.enemy.owner = e;
-			setmodel(e.enemy, "models/marker.md3");
+			setmodel(e.enemy, MDL_MARKER);
 			e.enemy.skin = 1;
 			setsize(e.enemy, '0 0 0', '0 0 0');
 			end = normalize(self.origin + self.view_ofs - e.aiment.origin);
@@ -465,7 +464,7 @@ float CheatCommand(float argc)
 			e.think = DragBox_Think;
 			e.nextthink = time;
 			e.solid = 0; // nothing special
-			setmodel(e, "models/marker.md3");
+			setmodel(e, MDL_MARKER);
 			setsize(e, PL_MIN, PL_MAX);
 			e.skin = 2;
 			if(argc == 3)
@@ -1085,19 +1084,19 @@ void DragBox_Think()
 	if(self.cnt == -1) // actually race_place -1
 	{
 		// show "10 10" for qualifying spawns
-		setmodel(self.killindicator, "models/sprites/10.spr32");
-		setmodel(self.killindicator.killindicator, "models/sprites/10.spr32");
+		setmodel(self.killindicator, MDL_NUM(10));
+		setmodel(self.killindicator.killindicator, MDL_NUM(10));
 	}
 	else if(self.cnt == -2) // actually race_place 0
 	{
 		// show "10 0" for loser spawns
-		setmodel(self.killindicator, "models/sprites/10.spr32");
-		setmodel(self.killindicator.killindicator, "models/sprites/0.spr32");
+		setmodel(self.killindicator, MDL_NUM(10));
+		setmodel(self.killindicator.killindicator, MDL_NUM(0));
 	}
 	else
 	{
-		setmodel(self.killindicator, strcat("models/sprites/", ftos(self.cnt % 10), ".spr32"));
-		setmodel(self.killindicator.killindicator, strcat("models/sprites/", ftos(floor(self.cnt / 10)), ".spr32"));
+		setmodel(self.killindicator, MDL_NUM(self.cnt % 10));
+		setmodel(self.killindicator.killindicator, MDL_NUM(floor(self.cnt / 10)));
 	}
 
 	self.nextthink = time;