X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=9f763a886d73217cd4490aa05fba9f75a2add448;hb=6bdd884aa6a85aed547c4c286e438e1951879805;hp=40ca3da2759d96efa8d08b3d988c6e08bb67d54d;hpb=cff3504ad5e8ace014ea44de7ad04ad6e246a277;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 40ca3da27..9f763a886 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -4,7 +4,7 @@
 #include "race.qh"
 #include "../common/triggers/teleporters.qh"
 
-#include "mutators/all.qh"
+#include "mutators/_mod.qh"
 
 #include "weapons/tracing.qh"
 
@@ -14,9 +14,9 @@
 
 #include <common/physics/player.qh>
 
-#include "../common/monsters/all.qh"
+#include "../common/monsters/_mod.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 #include "../common/triggers/subs.qh"
 
@@ -323,7 +323,7 @@ float CheatCommand(entity this, int argc)
 				// arguments:
 				//   effectname
 				effectnum = _particleeffectnum(argv(1));
-				W_SetupShot(this, false, false, SND_Null, CH_WEAPON_A, 0);
+				W_SetupShot(this, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0);
 				traceline(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, MOVE_NORMAL, this);
 				__trailparticles(this, effectnum, w_shotorg, trace_endpos);
 				DID_CHEAT();
@@ -338,7 +338,7 @@ float CheatCommand(entity this, int argc)
 				// arguments:
 				//   modelname mode
 				f = stof(argv(2));
-				W_SetupShot(this, false, false, SND_Null, CH_WEAPON_A, 0);
+				W_SetupShot(this, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0);
 				traceline(w_shotorg, w_shotorg + w_shotdir * 2048, MOVE_NORMAL, this);
 				if((trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) || trace_fraction == 1)
 				{
@@ -913,7 +913,7 @@ void Drag_Finish(entity dragger)
 			break;
 	}
 
-	if((draggee.flags & FL_ITEM) && (vlen(draggee.velocity) < 32))
+	if((draggee.flags & FL_ITEM) && (vdist(draggee.velocity, <, 32)))
 	{
 		draggee.velocity = '0 0 0';
 		SET_ONGROUND(draggee); // floating items are FUN