Merge branch 'drjaska/monster-loot-offswitch' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / _all.inc

diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc
index 3117f3e6e90d9b1df774d007f96e1aec6b0eed34..0a2cca157e65e54bd9bd3d9fb45b64a2dfdc4eba 100644 (file)
--- a/qcsrc/common/_all.inc
+++ b/qcsrc/common/_all.inc
@@ -1,4 +1,4 @@
-float autocvar_net_connecttimeout = 30;
+noref float autocvar_net_connecttimeout = 30;
 
 #ifdef GAMEQC
 #include "anim.qc"
@@ -22,7 +22,7 @@ float autocvar_net_connecttimeout = 30;
 
 #ifdef GAMEQC
 #include "physics/all.inc"
-#include "triggers/include.qc"
+#include "mapobjects/_mod.inc"
 #include "viewloc.qc"
 #endif
 
@@ -39,14 +39,15 @@ float autocvar_net_connecttimeout = 30;
 #include "effects/all.qc"
 #include "impulses/all.qc"
 #include "notifications/all.qc"
-#include "t_items.qc"
 #endif
 
 #include "items/_mod.inc"
     #include "weapons/_all.inc"
         #include "monsters/_mod.inc"
-        #include "turrets/all.qc"
-        #include "vehicles/all.qc"
+        #include "turrets/_mod.inc"
+        #include "vehicles/_mod.inc"
 
 #include "mutators/_mod.inc"
     #include "gamemodes/_mod.inc"
+
+#include "resources/_mod.inc"