Merge branch 'master' into TimePath/deathtypes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / sv_main.qc

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 43118d926477145a3043aae80e10e9e9d271277b..0a9d8f21014dab6571af9b9deb818ae0d7ed1702 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -1,4 +1,3 @@
-#include "_all.qh"
 
 #include "anticheat.qh"
 #include "g_hook.qh"
@@ -20,12 +19,13 @@
 #include "../common/vehicles/all.qh"
 #include "../common/weapons/all.qh"
 
-#include "../csqcmodellib/sv_model.qh"
+#include "../lib/csqcmodel/sv_model.qh"
 
-#include "../warpzonelib/common.qh"
-#include "../warpzonelib/server.qh"
+#include "../lib/warpzone/common.qh"
+#include "../lib/warpzone/server.qh"
 
 .float lastground;
+.int state;
 
 void CreatureFrame (void)
 {SELFPARAM();