make w_all.qc better mergable
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Thu, 4 Feb 2010 13:35:07 +0000 (13:35 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Thu, 4 Feb 2010 13:35:07 +0000 (13:35 +0000)
git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8611 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

data/qcsrc/server/w_all.qc

index 119548c..fdb02cf 100644 (file)
@@ -1,18 +1,16 @@
-// NOTE: the weapon priority lists in defaultNexuiz.cfg need to match the order
-// of the weapons in this file. Therefore, avoid reordering.
-#include "w_laser.qc" // 1
-#include "w_shotgun.qc" // 2
-#include "w_uzi.qc" // 3
-#include "w_grenadelauncher.qc" // 4
-#include "w_electro.qc" // 5
-#include "w_crylink.qc" // 6
-#include "w_nex.qc" // 7
-#include "w_hagar.qc" // 8
-#include "w_rocketlauncher.qc" // 9
-#include "w_porto.qc" // 10
-#include "w_minstanex.qc" // 11
-#include "w_hook.qc" // 12
-#include "w_hlac.qc" // 13
-#include "w_tuba.qc" // 14
-#include "w_campingrifle.qc" // 15
-#include "w_fireball.qc" // 16
+#include "w_laser.qc"
+#include "w_shotgun.qc"
+#include "w_uzi.qc"
+#include "w_grenadelauncher.qc"
+#include "w_electro.qc"
+#include "w_crylink.qc"
+#include "w_nex.qc"
+#include "w_hagar.qc"
+#include "w_rocketlauncher.qc"
+#include "w_porto.qc"
+#include "w_minstanex.qc"
+#include "w_hook.qc"
+#include "w_hlac.qc"
+#include "w_tuba.qc"
+#include "w_campingrifle.qc"
+#include "w_fireball.qc"