give all weapon files a w_function

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index e039ce46dcda8777ed171f7c5a7df158e1b891b9..cd8b4602e1004bb944ce94c9878f4e034422772a 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -65,6 +65,7 @@ bgmscript.qc
 ../common/gamecommand.qc
 ../common/mapinfo.qc
 ../common/items.qc
 ../common/gamecommand.qc
 ../common/mapinfo.qc
 ../common/items.qc

+../server/w_all.qc

 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index 3900b08deabdf8c510daeeb94aad7b7fe3f50dcf..531a3115baaa8ae9b83a4bff870f90207f3ec233 100644 (file)
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -97,12 +97,12 @@ float WEPBIT_ALL;
                register_weapon(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname); \
        } \
        ACCUMULATE_FUNCTION(RegisterWeapons, RegisterWeapons_##id)
                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) \
 #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) \
 #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"
 #endif
 
 #include "../server/w_all.qc"

diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc
index 2ee72701ff4838b18b9ff0d01555f02ec9bf1b23..174b3c400cc6ef8f3ed2674441c23c5dc6141295 100644 (file)
--- a/qcsrc/server/w_campingrifle.qc
+++ b/qcsrc/server/w_campingrifle.qc
@@ -296,5 +296,9 @@ float w_campingrifle(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_campingrifle(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 53a737f2dde379f2834ea422603fca269f0d8898..f5450a63d57bd7bd49ac4e6402fdd671ac050c9c 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -237,5 +237,9 @@ float w_crylink(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_crylink(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 7c61599aeeedcca146dfd971d5d026d71f432974..974626cca0b92fa3066f2144b3506e06c98b04c1 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -319,5 +319,9 @@ float w_electro(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_electro(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 10ff3b14d051239f59abe89b4ff788401e97ef2b..0551dbe4cf01a32734cc48c287aee137de098f78 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -394,5 +394,9 @@ float w_fireball(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_fireball(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 9409a2b6f218f6a46ac63ea72dc9f6a61594d0b1..972c8c249a1b5a744937ab3c4ca8039d4a4d37a0 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -238,5 +238,9 @@ float w_glauncher(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_glauncher(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index ed2cc3ad6ae549f26a721ea0d51fe0262468612b..83e1cf0821965e51242cb6ae23d2d3a06c011f6e 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -164,5 +164,9 @@ float w_hagar(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_hagar(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 4de9937977c5f1d6098302428491eb33b2ddbf96..ebdd0f99e19e2e1a62750ef69de95e68fb596c34 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -215,5 +215,9 @@ float w_hlac(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_hlac(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index ffec6ac71241f82e6b7a4451bb43d9124cc2d956..2b639024488cce4a96a914739c3fa779e29c632b 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -251,5 +251,9 @@ float w_hook(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_hook(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index eb3740f394651677872078949026835ed94da044..f8f700b4b96959a38c7ff4d6b587a0f7b31f73a5 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -188,5 +188,9 @@ float w_laser(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_laser(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index f44f1bec5933ed2c03fc12939300fc738cb0e7c8..837d73dca55c5c885b073daa6a29601a872f7b2d 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -244,5 +244,9 @@ float w_minstanex(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_minstanex(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 931d2ef0fd0658e6283d253e21b35aa910f9bcbb..24c0af53749b301e482748b89bae76ba8f7af276 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -82,5 +82,9 @@ float w_nex(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_nex(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 5b037bf20f51d741e9638d2cdee91ab9092aabb8..13847920f3519346aa1a1ad297e3acd99ecc640e 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -281,5 +281,9 @@ float w_porto(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_porto(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index d2c0e412a9df7e589e3b59f66a95c392804544ee..5dd0b319995ca60bbb6bc0d09295dd7574d7bb0e 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -563,5 +563,9 @@ float w_rlauncher(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_rlauncher(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 16cc4728167a37733bdda87a2e7c91079585dd6d..cdb4615c731dff66d994878ed74fbb925bca2a08 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -481,5 +481,9 @@ float w_seeker(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_seeker(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index ad2bca91800cfcb72433f1c43cbebef5aebee1ca..d4352c04781629a5a88f29e2864c3b2eb49fafe9 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -150,5 +150,9 @@ float w_shotgun(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_shotgun(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 0ba1aae3e3ef10a06606992f035cabbfc211522f..295282f4762277cf45d9f5cad06e91fe0d3ca448 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -253,5 +253,9 @@ float w_tuba(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_tuba(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index e392ac9d267a4ee48fb7453e4a059eb801fd4458..d6ea5c35b6ae3d14e1feaf7c0a5bde05a16c0173 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -139,5 +139,9 @@ float w_uzi(float req)
 };
 #endif
 #ifdef CSQC
 };
 #endif
 #ifdef CSQC

+float w_uzi(float req)
+{
+       return TRUE;
+}

 #endif
 #endif
 #endif
 #endif