From 3a3bb69229fa0088270449da8b585a10613a412e Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 9 Dec 2013 13:31:00 -0500 Subject: [PATCH] Begin adding support for weaponstart and weaponreplace properties --- qcsrc/common/weapons/config.qh | 10 ++++++++-- qcsrc/common/weapons/w_arc.qc | 8 ++++---- qcsrc/common/weapons/w_blaster.qc | 8 ++++---- qcsrc/common/weapons/w_crylink.qc | 8 ++++---- qcsrc/common/weapons/w_devastator.qc | 16 +++++++++------- qcsrc/common/weapons/w_electro.qc | 8 ++++---- qcsrc/common/weapons/w_fireball.qc | 8 ++++---- qcsrc/common/weapons/w_hagar.qc | 8 ++++---- qcsrc/common/weapons/w_hlac.qc | 8 ++++---- qcsrc/common/weapons/w_hook.qc | 8 ++++---- qcsrc/common/weapons/w_machinegun.qc | 8 ++++---- qcsrc/common/weapons/w_minelayer.qc | 8 ++++---- qcsrc/common/weapons/w_minstanex.qc | 8 ++++---- qcsrc/common/weapons/w_mortar.qc | 8 ++++---- qcsrc/common/weapons/w_nex.qc | 8 ++++---- qcsrc/common/weapons/w_porto.qc | 8 ++++---- qcsrc/common/weapons/w_rifle.qc | 8 ++++---- qcsrc/common/weapons/w_seeker.qc | 8 ++++---- qcsrc/common/weapons/w_shockwave.qc | 8 ++++---- qcsrc/common/weapons/w_tuba.qc | 8 ++++---- qcsrc/common/weapons/weapons.qh | 8 ++++---- 21 files changed, 93 insertions(+), 85 deletions(-) diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh index 9e21414ce..784439508 100644 --- a/qcsrc/common/weapons/config.qh +++ b/qcsrc/common/weapons/config.qh @@ -43,8 +43,14 @@ string wep_config_queue[MAX_WEP_CONFIG]; #define WEP_CONFIG_WRITE_CVARS(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name) -// WEAPONTODO: remove prop -#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,mode,name) \ +#define WEP_CONFIG_WRITE_PROPS_string(wepname,name) \ + { WEP_CONFIG_QUEUE( \ + sprintf("set g_balance_%s_%s \"%s\"\n", #wepname, #name, \ + cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) } + +#define WEP_CONFIG_WRITE_PROPS_float(wepname,name) \ { WEP_CONFIG_QUEUE( \ sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \ cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) } + +#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,type,prop,name) WEP_CONFIG_WRITE_PROPS_##type(wepname,name) diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index ded457589..d6488d42c 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -21,10 +21,10 @@ REGISTER_WEAPON( w_cvar(WEP_ARC, arc, MO_PRI, force) \ w_cvar(WEP_ARC, arc, MO_PRI, range) \ w_cvar(WEP_ARC, arc, MO_PRI, refire) \ - w_prop(WEP_ARC, arc, reloading_ammo, reload_ammo) \ - w_prop(WEP_ARC, arc, reloading_time, reload_time) \ - w_prop(WEP_ARC, arc, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_ARC, arc, switchdelay_drop, switchdelay_drop) + w_prop(WEP_ARC, arc, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_ARC, arc, float, reloading_time, reload_time) \ + w_prop(WEP_ARC, arc, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_ARC, arc, float, switchdelay_drop, switchdelay_drop) #ifndef MENUQC vector arc_shotorigin[4]; diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index b39180c6f..5d0ba61cd 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -24,10 +24,10 @@ REGISTER_WEAPON( w_cvar(WEP_BLASTER, blaster, MO_BOTH, speed) \ w_cvar(WEP_BLASTER, blaster, MO_BOTH, spread) \ w_cvar(WEP_BLASTER, blaster, MO_NONE, secondary) \ - w_prop(WEP_BLASTER, blaster, reloading_ammo, reload_ammo) \ - w_prop(WEP_BLASTER, blaster, reloading_time, reload_time) \ - w_prop(WEP_BLASTER, blaster, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_BLASTER, blaster, switchdelay_drop, switchdelay_drop) + w_prop(WEP_BLASTER, blaster, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_BLASTER, blaster, float, reloading_time, reload_time) \ + w_prop(WEP_BLASTER, blaster, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_BLASTER, blaster, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC BLASTER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index 15511a01c..8c79e2091 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -37,10 +37,10 @@ REGISTER_WEAPON( w_cvar(WEP_CRYLINK, crylink, MO_BOTH, joinexplode_radius) \ w_cvar(WEP_CRYLINK, crylink, MO_BOTH, joinexplode_force) \ w_cvar(WEP_CRYLINK, crylink, MO_SEC, spreadtype) \ - w_prop(WEP_CRYLINK, crylink, reloading_ammo, reload_ammo) \ - w_prop(WEP_CRYLINK, crylink, reloading_time, reload_time) \ - w_prop(WEP_CRYLINK, crylink, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_CRYLINK, crylink, switchdelay_drop, switchdelay_drop) + w_prop(WEP_CRYLINK, crylink, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_CRYLINK, crylink, float, reloading_time, reload_time) \ + w_prop(WEP_CRYLINK, crylink, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_CRYLINK, crylink, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC CRYLINK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index 1bdbbd51e..90ab1c4c3 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -35,10 +35,12 @@ REGISTER_WEAPON( w_cvar(WEP_DEVASTATOR, devastator, MO_NONE, speed) \ w_cvar(WEP_DEVASTATOR, devastator, MO_NONE, speedaccel) \ w_cvar(WEP_DEVASTATOR, devastator, MO_NONE, speedstart) \ - w_prop(WEP_DEVASTATOR, devastator, reloading_ammo, reload_ammo) \ - w_prop(WEP_DEVASTATOR, devastator, reloading_time, reload_time) \ - w_prop(WEP_DEVASTATOR, devastator, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_DEVASTATOR, devastator, switchdelay_drop, switchdelay_drop) + w_prop(WEP_DEVASTATOR, devastator, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_DEVASTATOR, devastator, float, reloading_time, reload_time) \ + w_prop(WEP_DEVASTATOR, devastator, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_DEVASTATOR, devastator, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_DEVASTATOR, devastator, string, weaponreplace, weaponreplace) \ + w_prop(WEP_DEVASTATOR, devastator, float, weaponstart, weaponstart) #ifdef SVQC DEVASTATOR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) @@ -329,7 +331,7 @@ float W_Devastator(float req) for(missile = world; (missile = find(missile, classname, "rocket")); ) if(missile.realowner == self) { targ = targetlist; - while (targ) + while(targ) { if(targ != missile.realowner && vlen(targ.origin - missile.origin) < WEP_CVAR(devastator, radius)) { @@ -351,7 +353,7 @@ float W_Devastator(float req) WEP_ACTION(self.weapon, WR_RELOAD); else { - if (self.BUTTON_ATCK) + if(self.BUTTON_ATCK) { if(self.rl_release || WEP_CVAR(devastator, guidestop)) if(weapon_prepareattack(0, WEP_CVAR(devastator, refire))) @@ -364,7 +366,7 @@ float W_Devastator(float req) else self.rl_release = 1; - if (self.BUTTON_ATCK2) + if(self.BUTTON_ATCK2) { rockfound = 0; for(rock = world; (rock = find(rock, classname, "rocket")); ) if(rock.realowner == self) diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index ae474c0f8..e85572746 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -44,10 +44,10 @@ REGISTER_WEAPON( w_cvar(WEP_ELECTRO, electro, MO_NONE, combo_radius) \ w_cvar(WEP_ELECTRO, electro, MO_NONE, combo_speed) \ w_cvar(WEP_ELECTRO, electro, MO_NONE, combo_safeammocheck) \ - w_prop(WEP_ELECTRO, electro, reloading_ammo, reload_ammo) \ - w_prop(WEP_ELECTRO, electro, reloading_time, reload_time) \ - w_prop(WEP_ELECTRO, electro, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_ELECTRO, electro, switchdelay_drop, switchdelay_drop) + w_prop(WEP_ELECTRO, electro, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_ELECTRO, electro, float, reloading_time, reload_time) \ + w_prop(WEP_ELECTRO, electro, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_ELECTRO, electro, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC ELECTRO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index b121bd9b5..b09e24fa2 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -34,10 +34,10 @@ REGISTER_WEAPON( w_cvar(WEP_FIREBALL, fireball, MO_SEC, damagetime) \ w_cvar(WEP_FIREBALL, fireball, MO_SEC, speed_up) \ w_cvar(WEP_FIREBALL, fireball, MO_SEC, speed_z) \ - w_prop(WEP_FIREBALL, fireball, reloading_ammo, reload_ammo) \ - w_prop(WEP_FIREBALL, fireball, reloading_time, reload_time) \ - w_prop(WEP_FIREBALL, fireball, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_FIREBALL, fireball, switchdelay_drop, switchdelay_drop) + w_prop(WEP_FIREBALL, fireball, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_FIREBALL, fireball, float, reloading_time, reload_time) \ + w_prop(WEP_FIREBALL, fireball, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_FIREBALL, fireball, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC FIREBALL_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index b64f58686..2fd60fc4a 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -36,10 +36,10 @@ REGISTER_WEAPON( w_cvar(WEP_HAGAR, hagar, MO_SEC, lifetime_min) \ w_cvar(WEP_HAGAR, hagar, MO_SEC, lifetime_rand) \ w_cvar(WEP_HAGAR, hagar, MO_NONE, secondary) \ - w_prop(WEP_HAGAR, hagar, reloading_ammo, reload_ammo) \ - w_prop(WEP_HAGAR, hagar, reloading_time, reload_time) \ - w_prop(WEP_HAGAR, hagar, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_HAGAR, hagar, switchdelay_drop, switchdelay_drop) + w_prop(WEP_HAGAR, hagar, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_HAGAR, hagar, float, reloading_time, reload_time) \ + w_prop(WEP_HAGAR, hagar, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_HAGAR, hagar, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC HAGAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc index 28ae9a0b5..e728bb9cf 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -28,10 +28,10 @@ REGISTER_WEAPON( w_cvar(WEP_HLAC, hlac, MO_NONE, secondary) \ w_cvar(WEP_HLAC, hlac, MO_SEC, shots) \ w_cvar(WEP_HLAC, hlac, MO_SEC, spread) \ - w_prop(WEP_HLAC, hlac, reloading_ammo, reload_ammo) \ - w_prop(WEP_HLAC, hlac, reloading_time, reload_time) \ - w_prop(WEP_HLAC, hlac, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_HLAC, hlac, switchdelay_drop, switchdelay_drop) + w_prop(WEP_HLAC, hlac, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_HLAC, hlac, float, reloading_time, reload_time) \ + w_prop(WEP_HLAC, hlac, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_HLAC, hlac, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC HLAC_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index 53eba79bf..264629d87 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -29,10 +29,10 @@ REGISTER_WEAPON( w_cvar(WEP_HOOK, hook, MO_SEC, speed) \ w_cvar(WEP_HOOK, hook, MO_SEC, health) \ w_cvar(WEP_HOOK, hook, MO_SEC, damageforcescale) \ - w_prop(WEP_HOOK, hook, reloading_ammo, reload_ammo) \ - w_prop(WEP_HOOK, hook, reloading_time, reload_time) \ - w_prop(WEP_HOOK, hook, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_HOOK, hook, switchdelay_drop, switchdelay_drop) + w_prop(WEP_HOOK, hook, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_HOOK, hook, float, reloading_time, reload_time) \ + w_prop(WEP_HOOK, hook, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_HOOK, hook, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index cc9cf3285..672f1bc59 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -35,10 +35,10 @@ REGISTER_WEAPON( w_cvar(WEP_UZI, uzi, MO_NONE, burst_animtime) \ w_cvar(WEP_UZI, uzi, MO_NONE, burst_speed) \ w_cvar(WEP_UZI, uzi, MO_NONE, burst_ammo) \ - w_prop(WEP_UZI, uzi, reloading_ammo, reload_ammo) \ - w_prop(WEP_UZI, uzi, reloading_time, reload_time) \ - w_prop(WEP_UZI, uzi, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_UZI, uzi, switchdelay_drop, switchdelay_drop) + w_prop(WEP_UZI, uzi, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_UZI, uzi, float, reloading_time, reload_time) \ + w_prop(WEP_UZI, uzi, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_UZI, uzi, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC UZI_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index bb7bae1bf..5bacdb9f9 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -33,10 +33,10 @@ REGISTER_WEAPON( w_cvar(WEP_MINE_LAYER, minelayer, MO_NONE, remote_radius) \ w_cvar(WEP_MINE_LAYER, minelayer, MO_NONE, speed) \ w_cvar(WEP_MINE_LAYER, minelayer, MO_NONE, time) \ - w_prop(WEP_MINE_LAYER, minelayer, reloading_ammo, reload_ammo) \ - w_prop(WEP_MINE_LAYER, minelayer, reloading_time, reload_time) \ - w_prop(WEP_MINE_LAYER, minelayer, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_MINE_LAYER, minelayer, switchdelay_drop, switchdelay_drop) + w_prop(WEP_MINE_LAYER, minelayer, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_MINE_LAYER, minelayer, float, reloading_time, reload_time) \ + w_prop(WEP_MINE_LAYER, minelayer, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_MINE_LAYER, minelayer, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC MINELAYER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc index d9e3cd158..178ffa4cc 100644 --- a/qcsrc/common/weapons/w_minstanex.qc +++ b/qcsrc/common/weapons/w_minstanex.qc @@ -27,10 +27,10 @@ REGISTER_WEAPON( w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, shotangle) \ w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, speed) \ w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, spread) \ - w_prop(WEP_MINSTANEX, minstanex, reloading_ammo, reload_ammo) \ - w_prop(WEP_MINSTANEX, minstanex, reloading_time, reload_time) \ - w_prop(WEP_MINSTANEX, minstanex, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_MINSTANEX, minstanex, switchdelay_drop, switchdelay_drop) + w_prop(WEP_MINSTANEX, minstanex, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_MINSTANEX, minstanex, float, reloading_time, reload_time) \ + w_prop(WEP_MINSTANEX, minstanex, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_MINSTANEX, minstanex, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC MINSTANEX_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index e7db52f7a..a4dda2fb8 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -33,10 +33,10 @@ REGISTER_WEAPON( w_cvar(WEP_MORTAR, mortar, MO_BOTH, speed_z) \ w_cvar(WEP_MORTAR, mortar, MO_BOTH, spread) \ w_cvar(WEP_MORTAR, mortar, MO_BOTH, type) \ - w_prop(WEP_MORTAR, mortar, reloading_ammo, reload_ammo) \ - w_prop(WEP_MORTAR, mortar, reloading_time, reload_time) \ - w_prop(WEP_MORTAR, mortar, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_MORTAR, mortar, switchdelay_drop, switchdelay_drop) + w_prop(WEP_MORTAR, mortar, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_MORTAR, mortar, float, reloading_time, reload_time) \ + w_prop(WEP_MORTAR, mortar, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_MORTAR, mortar, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC MORTAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc index 1ae87d05d..3cff6e001 100644 --- a/qcsrc/common/weapons/w_nex.qc +++ b/qcsrc/common/weapons/w_nex.qc @@ -37,10 +37,10 @@ REGISTER_WEAPON( w_cvar(WEP_NEX, nex, MO_SEC, chargepool) \ w_cvar(WEP_NEX, nex, MO_SEC, chargepool_regen) \ w_cvar(WEP_NEX, nex, MO_SEC, chargepool_pause_regen) \ - w_prop(WEP_NEX, nex, reloading_ammo, reload_ammo) \ - w_prop(WEP_NEX, nex, reloading_time, reload_time) \ - w_prop(WEP_NEX, nex, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_NEX, nex, switchdelay_drop, switchdelay_drop) + w_prop(WEP_NEX, nex, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_NEX, nex, float, reloading_time, reload_time) \ + w_prop(WEP_NEX, nex, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_NEX, nex, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC NEX_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc index 40b1441a6..8ba8f9cc4 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -17,10 +17,10 @@ REGISTER_WEAPON( w_cvar(WEP_PORTO, porto, MO_BOTH, refire) \ w_cvar(WEP_PORTO, porto, MO_BOTH, speed) \ w_cvar(WEP_PORTO, porto, MO_NONE, secondary) \ - w_prop(WEP_PORTO, porto, reloading_ammo, reload_ammo) \ - w_prop(WEP_PORTO, porto, reloading_time, reload_time) \ - w_prop(WEP_PORTO, porto, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_PORTO, porto, switchdelay_drop, switchdelay_drop) + w_prop(WEP_PORTO, porto, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_PORTO, porto, float, reloading_time, reload_time) \ + w_prop(WEP_PORTO, porto, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_PORTO, porto, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC PORTO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index 96f755183..8d0acb9b4 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -28,10 +28,10 @@ REGISTER_WEAPON( w_cvar(WEP_RIFLE, rifle, MO_NONE, bursttime) \ w_cvar(WEP_RIFLE, rifle, MO_NONE, secondary) \ w_cvar(WEP_RIFLE, rifle, MO_SEC, reload) \ - w_prop(WEP_RIFLE, rifle, reloading_ammo, reload_ammo) \ - w_prop(WEP_RIFLE, rifle, reloading_time, reload_time) \ - w_prop(WEP_RIFLE, rifle, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_RIFLE, rifle, switchdelay_drop, switchdelay_drop) + w_prop(WEP_RIFLE, rifle, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_RIFLE, rifle, float, reloading_time, reload_time) \ + w_prop(WEP_RIFLE, rifle, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_RIFLE, rifle, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC RIFLE_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc index 07e0da59f..34061dd15 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -62,10 +62,10 @@ REGISTER_WEAPON( w_cvar(WEP_SEEKER, seeker, MO_NONE, tag_speed) \ w_cvar(WEP_SEEKER, seeker, MO_NONE, tag_spread) \ w_cvar(WEP_SEEKER, seeker, MO_NONE, tag_tracker_lifetime) \ - w_prop(WEP_SEEKER, seeker, reloading_ammo, reload_ammo) \ - w_prop(WEP_SEEKER, seeker, reloading_time, reload_time) \ - w_prop(WEP_SEEKER, seeker, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_SEEKER, seeker, switchdelay_drop, switchdelay_drop) + w_prop(WEP_SEEKER, seeker, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_SEEKER, seeker, float, reloading_time, reload_time) \ + w_prop(WEP_SEEKER, seeker, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_SEEKER, seeker, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC SEEKER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index 79d1115dc..2284f87fc 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -65,10 +65,10 @@ REGISTER_WEAPON( w_cvar(WEP_SHOCKWAVE, shockwave, MO_NONE, pellets_spread) \ w_cvar(WEP_SHOCKWAVE, shockwave, MO_NONE, primary) \ w_cvar(WEP_SHOCKWAVE, shockwave, MO_NONE, secondary) \ - w_prop(WEP_SHOCKWAVE, shockwave, reloading_ammo, reload_ammo) \ - w_prop(WEP_SHOCKWAVE, shockwave, reloading_time, reload_time) \ - w_prop(WEP_SHOCKWAVE, shockwave, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_SHOCKWAVE, shockwave, switchdelay_drop, switchdelay_drop) + w_prop(WEP_SHOCKWAVE, shockwave, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_SHOCKWAVE, shockwave, float, reloading_time, reload_time) \ + w_prop(WEP_SHOCKWAVE, shockwave, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_SHOCKWAVE, shockwave, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC SHOCKWAVE_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc index 78d050465..e6122f8ec 100644 --- a/qcsrc/common/weapons/w_tuba.qc +++ b/qcsrc/common/weapons/w_tuba.qc @@ -20,10 +20,10 @@ REGISTER_WEAPON( w_cvar(WEP_TUBA, tuba, MO_NONE, force) \ w_cvar(WEP_TUBA, tuba, MO_NONE, radius) \ w_cvar(WEP_TUBA, tuba, MO_NONE, refire) \ - w_prop(WEP_TUBA, tuba, reloading_ammo, reload_ammo) \ - w_prop(WEP_TUBA, tuba, reloading_time, reload_time) \ - w_prop(WEP_TUBA, tuba, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_TUBA, tuba, switchdelay_drop, switchdelay_drop) + w_prop(WEP_TUBA, tuba, float, reloading_ammo, reload_ammo) \ + w_prop(WEP_TUBA, tuba, float, reloading_time, reload_time) \ + w_prop(WEP_TUBA, tuba, float, switchdelay_raise, switchdelay_raise) \ + w_prop(WEP_TUBA, tuba, float, switchdelay_drop, switchdelay_drop) #ifdef SVQC TUBA_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh index 800a49dee..1982f047c 100644 --- a/qcsrc/common/weapons/weapons.qh +++ b/qcsrc/common/weapons/weapons.qh @@ -157,9 +157,9 @@ float W_AmmoItemCode(float wpn); #define WEP_ADD_CVAR(wepid,wepname,mode,name) WEP_ADD_CVAR_##mode(wepname, name) // create properties for weapon settings -#define WEP_ADD_PROP(wepid,wepname,prop,name) \ - .float ##prop; \ - final float autocvar_g_balance_##wepname##_##name; +#define WEP_ADD_PROP(wepid,wepname,type,prop,name) \ + .type ##prop; \ + final type autocvar_g_balance_##wepname##_##name; // read cvars from weapon settings #define WEP_CVAR(wepname,name) autocvar_g_balance_##wepname##_##name @@ -169,7 +169,7 @@ float W_AmmoItemCode(float wpn); // set initialization values for weapon settings #define WEP_SKIPCVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */ -#define WEP_SET_PROP(wepid,wepname,prop,name) get_weaponinfo(##wepid).##prop = autocvar_g_balance_##wepname##_##name; +#define WEP_SET_PROP(wepid,wepname,type,prop,name) get_weaponinfo(##wepid).##prop = autocvar_g_balance_##wepname##_##name; float w_null(float dummy); void register_weapon(float id, WepSet bit, float(float) func, float ammotype, float i, float weapontype, float pickupbasevalue, string modelname, string shortname, string wname); -- 2.39.2