Merge branch 'master' into terencehill/weapon_panel_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / all.qh

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index a0615504ba6519afca2732a1f8d355c843d087f6..b4ee1e25d9608d7d428cb22d9063413853b0da67 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -1,15 +1,25 @@
+// TODO: include once
+//#ifndef WEAPONS_ALL_H
+//#define WEAPONS_ALL_H
+
+#include "../util.qh"
+
+#ifdef SVQC
+#   include "config.qh"
+#   include "../../server/bot/aim.qh"
+#endif
+
 // ONLY EVER ADD NEW WEAPONS AT THE END. IF YOU REMOVE ONE, PUT THE LAST ONE ON
 // ITS PLACE. THIS IS TO AVOID UNNECESSARY RENUMBERING OF WEAPON IMPULSES.
 // IF YOU DISREGARD THIS NOTICE, I'LL KILL YOU WITH THE @!#%'N TUBA
 
 // core weapons
 #include "w_blaster.qc"
-#include "w_shockwave.qc"
-#include "w_uzi.qc"
+#include "w_shotgun.qc"
+#include "w_machinegun.qc"
 #include "w_mortar.qc"
 #include "w_minelayer.qc"
 #include "w_electro.qc"
-#include "w_arc.qc"
 #include "w_crylink.qc"
 #include "w_vortex.qc"
 #include "w_hagar.qc"
@@ -24,4 +34,9 @@
 #include "w_rifle.qc"
 #include "w_fireball.qc"
 #include "w_seeker.qc"
-#include "w_shotgun.qc"
+#include "w_shockwave.qc"
+#include "w_arc.qc"
+#include "w_hmg.qc"
+#include "w_rpc.qc"
+
+//#endif