X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=0f43d92c0a48d46e3ed1dc4421ec2967aa5aa4d6;hb=5e504bae6cfc01a24dd6dc2e673a35d80c8a1759;hp=361afadee6d1dce14f016c3022f8ac06425046c1;hpb=6b8b403dbd938914eeaa6a02f98d0e939950d29e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 361afadee..0f43d92c0 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,5 +1,4 @@
 #include "cheats.qh"
-#include "_all.qh"
 
 #include "g_damage.qh"
 #include "race.qh"
@@ -11,7 +10,6 @@
 
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
-#include "../common/effects/effects.qh"
 #include "../common/util.qh"
 
 #include "../common/monsters/all.qh"
@@ -22,10 +20,10 @@
 
 #include "../common/triggers/func/breakable.qh"
 
-#include "../csqcmodellib/sv_model.qh"
+#include "../lib/csqcmodel/sv_model.qh"
 
-#include "../warpzonelib/anglestransform.qh"
-#include "../warpzonelib/util_server.qh"
+#include "../lib/warpzone/anglestransform.qh"
+#include "../lib/warpzone/util_server.qh"
 
 void CopyBody(float keepvelocity);
 
@@ -129,8 +127,8 @@ void info_autoscreenshot_findtarget()
 	self.angles_y = a.y;
 	// we leave Rick Roll alone
 }
-void spawnfunc_info_autoscreenshot()
-{SELFPARAM();
+spawnfunc(info_autoscreenshot)
+{
 	if(++num_autoscreenshot > autocvar_g_max_info_autoscreenshot)
 	{
 		objerror("Too many info_autoscreenshot entitites. FAIL!");
@@ -372,7 +370,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
 					}
-					WITH(entity, self, e, spawnfunc_func_breakable());
+					WITH(entity, self, e, spawnfunc_func_breakable(e));
 					// now, is it valid?
 					if(f == 0)
 					{