From: Rudolf Polzer Date: Sun, 6 Jun 2010 12:01:38 +0000 (+0200) Subject: give all weapon files a w_function X-Git-Tag: xonotic-v0.1.0preview~547^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=079c02f9a7c398d6c433f8ead73a244a6833b77b;p=xonotic%2Fxonotic-data.pk3dir.git give all weapon files a w_function --- diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index e039ce46d..cd8b4602e 100644 --- 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 +../server/w_all.qc ../warpzonelib/anglestransform.qc ../warpzonelib/mathlib.qc diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh index 3900b08de..531a3115b 100644 --- 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) -#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" diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc index 2ee72701f..174b3c400 100644 --- a/qcsrc/server/w_campingrifle.qc +++ b/qcsrc/server/w_campingrifle.qc @@ -296,5 +296,9 @@ float w_campingrifle(float req) }; #endif #ifdef CSQC +float w_campingrifle(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 53a737f2d..f5450a63d 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -237,5 +237,9 @@ float w_crylink(float req) }; #endif #ifdef CSQC +float w_crylink(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 7c61599ae..974626cca 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -319,5 +319,9 @@ float w_electro(float req) }; #endif #ifdef CSQC +float w_electro(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 10ff3b14d..0551dbe4c 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -394,5 +394,9 @@ float w_fireball(float req) }; #endif #ifdef CSQC +float w_fireball(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 9409a2b6f..972c8c249 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -238,5 +238,9 @@ float w_glauncher(float req) }; #endif #ifdef CSQC +float w_glauncher(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index ed2cc3ad6..83e1cf082 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -164,5 +164,9 @@ float w_hagar(float req) }; #endif #ifdef CSQC +float w_hagar(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 4de993797..ebdd0f99e 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -215,5 +215,9 @@ float w_hlac(float req) }; #endif #ifdef CSQC +float w_hlac(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc index ffec6ac71..2b6390244 100644 --- a/qcsrc/server/w_hook.qc +++ b/qcsrc/server/w_hook.qc @@ -251,5 +251,9 @@ float w_hook(float req) }; #endif #ifdef CSQC +float w_hook(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index eb3740f39..f8f700b4b 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -188,5 +188,9 @@ float w_laser(float req) }; #endif #ifdef CSQC +float w_laser(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index f44f1bec5..837d73dca 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -244,5 +244,9 @@ float w_minstanex(float req) }; #endif #ifdef CSQC +float w_minstanex(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 931d2ef0f..24c0af537 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -82,5 +82,9 @@ float w_nex(float req) }; #endif #ifdef CSQC +float w_nex(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc index 5b037bf20..13847920f 100644 --- a/qcsrc/server/w_porto.qc +++ b/qcsrc/server/w_porto.qc @@ -281,5 +281,9 @@ float w_porto(float req) }; #endif #ifdef CSQC +float w_porto(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index d2c0e412a..5dd0b3199 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -563,5 +563,9 @@ float w_rlauncher(float req) }; #endif #ifdef CSQC +float w_rlauncher(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 16cc47281..cdb4615c7 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -481,5 +481,9 @@ float w_seeker(float req) }; #endif #ifdef CSQC +float w_seeker(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index ad2bca918..d4352c047 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -150,5 +150,9 @@ float w_shotgun(float req) }; #endif #ifdef CSQC +float w_shotgun(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc index 0ba1aae3e..295282f47 100644 --- a/qcsrc/server/w_tuba.qc +++ b/qcsrc/server/w_tuba.qc @@ -253,5 +253,9 @@ float w_tuba(float req) }; #endif #ifdef CSQC +float w_tuba(float req) +{ + return TRUE; +} #endif #endif diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index e392ac9d2..d6ea5c35b 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -139,5 +139,9 @@ float w_uzi(float req) }; #endif #ifdef CSQC +float w_uzi(float req) +{ + return TRUE; +} #endif #endif