Merge branch 'Mario/ctf_leadlimit' into 'master'

[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 bbf2a599a577c0b0f870540fed4a0b8f11594cae..a40488f8383f432005f52e2ffb7d657a436b77d0 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -4,14 +4,13 @@
 
 // core weapons
 #include "w_blaster.qc"
-#include "w_shockwave.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_nex.qc"
+#include "w_vortex.qc"
 #include "w_hagar.qc"
 #include "w_devastator.qc"
 
@@ -24,4 +23,5 @@
 #include "w_rifle.qc"
 #include "w_fireball.qc"
 #include "w_seeker.qc"
-#include "w_shotgun.qc"
+#include "w_shockwave.qc"
+#include "w_arc.qc"