Merge branch 'master' into Mario/wepent_experimental

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

diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc
index f528eee6db46aab5a426d78d60739db50ae83f7d..56681b099e756f6075da949446ca5dd605c7f102 100644 (file)
--- a/qcsrc/common/_all.inc
+++ b/qcsrc/common/_all.inc
@@ -1,10 +1,11 @@
-float autocvar_net_connecttimeout = 30;
+noref float autocvar_net_connecttimeout = 30;
 
 #ifdef GAMEQC
 #include "anim.qc"
 #include "animdecide.qc"
 #include "ent_cs.qc"
 #include "net_notice.qc"
+#include "wepent.qc"
 #endif
 
 #include "mapinfo.qc"
@@ -43,7 +44,7 @@ float autocvar_net_connecttimeout = 30;
 
 #include "items/_mod.inc"
     #include "weapons/_all.inc"
-        #include "monsters/all.qc"
+        #include "monsters/_mod.inc"
         #include "turrets/all.qc"
         #include "vehicles/all.qc"