give all weapon files a w_function
authorRudolf Polzer <divverent@alientrap.org>
Sun, 6 Jun 2010 12:01:38 +0000 (14:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 6 Jun 2010 12:01:38 +0000 (14:01 +0200)
19 files changed:
qcsrc/client/progs.src
qcsrc/common/items.qh
qcsrc/server/w_campingrifle.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_porto.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc

index e039ce4..cd8b460 100644 (file)
@@ -65,6 +65,7 @@ bgmscript.qc
 ../common/gamecommand.qc
 ../common/mapinfo.qc
 ../common/items.qc
+../server/w_all.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
index 3900b08..531a311 100644 (file)
@@ -97,12 +97,12 @@ float WEPBIT_ALL;
                register_weapon(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname); \
        } \
        ACCUMULATE_FUNCTION(RegisterWeapons, RegisterWeapons_##id)
-#ifdef SVQC
+#ifdef MENUQC
 #define REGISTER_WEAPON(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) \
-       REGISTER_WEAPON_2(WEP_##id,WEPBIT_##id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
+       REGISTER_WEAPON_2(WEP_##id,WEPBIT_##id,w_null,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
 #else
 #define REGISTER_WEAPON(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) \
-       REGISTER_WEAPON_2(WEP_##id,WEPBIT_##id,w_null,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
+       REGISTER_WEAPON_2(WEP_##id,WEPBIT_##id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
 #endif
 
 #include "../server/w_all.qc"
index 2ee7270..174b3c4 100644 (file)
@@ -296,5 +296,9 @@ float w_campingrifle(float req)
 };
 #endif
 #ifdef CSQC
+float w_campingrifle(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 53a737f..f5450a6 100644 (file)
@@ -237,5 +237,9 @@ float w_crylink(float req)
 };
 #endif
 #ifdef CSQC
+float w_crylink(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 7c61599..974626c 100644 (file)
@@ -319,5 +319,9 @@ float w_electro(float req)
 };
 #endif
 #ifdef CSQC
+float w_electro(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 10ff3b1..0551dbe 100644 (file)
@@ -394,5 +394,9 @@ float w_fireball(float req)
 };
 #endif
 #ifdef CSQC
+float w_fireball(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 9409a2b..972c8c2 100644 (file)
@@ -238,5 +238,9 @@ float w_glauncher(float req)
 };
 #endif
 #ifdef CSQC
+float w_glauncher(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index ed2cc3a..83e1cf0 100644 (file)
@@ -164,5 +164,9 @@ float w_hagar(float req)
 };
 #endif
 #ifdef CSQC
+float w_hagar(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 4de9937..ebdd0f9 100644 (file)
@@ -215,5 +215,9 @@ float w_hlac(float req)
 };
 #endif
 #ifdef CSQC
+float w_hlac(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index ffec6ac..2b63902 100644 (file)
@@ -251,5 +251,9 @@ float w_hook(float req)
 };
 #endif
 #ifdef CSQC
+float w_hook(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index eb3740f..f8f700b 100644 (file)
@@ -188,5 +188,9 @@ float w_laser(float req)
 };
 #endif
 #ifdef CSQC
+float w_laser(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index f44f1be..837d73d 100644 (file)
@@ -244,5 +244,9 @@ float w_minstanex(float req)
 };
 #endif
 #ifdef CSQC
+float w_minstanex(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 931d2ef..24c0af5 100644 (file)
@@ -82,5 +82,9 @@ float w_nex(float req)
 };
 #endif
 #ifdef CSQC
+float w_nex(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 5b037bf..1384792 100644 (file)
@@ -281,5 +281,9 @@ float w_porto(float req)
 };
 #endif
 #ifdef CSQC
+float w_porto(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index d2c0e41..5dd0b31 100644 (file)
@@ -563,5 +563,9 @@ float w_rlauncher(float req)
 };
 #endif
 #ifdef CSQC
+float w_rlauncher(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 16cc472..cdb4615 100644 (file)
@@ -481,5 +481,9 @@ float w_seeker(float req)
 };
 #endif
 #ifdef CSQC
+float w_seeker(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index ad2bca9..d4352c0 100644 (file)
@@ -150,5 +150,9 @@ float w_shotgun(float req)
 };
 #endif
 #ifdef CSQC
+float w_shotgun(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index 0ba1aae..295282f 100644 (file)
@@ -253,5 +253,9 @@ float w_tuba(float req)
 };
 #endif
 #ifdef CSQC
+float w_tuba(float req)
+{
+       return TRUE;
+}
 #endif
 #endif
index e392ac9..d6ea5c3 100644 (file)
@@ -139,5 +139,9 @@ float w_uzi(float req)
 };
 #endif
 #ifdef CSQC
+float w_uzi(float req)
+{
+       return TRUE;
+}
 #endif
 #endif