Begin adding support for weaponstart and weaponreplace properties

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 9e21414ce608bbeb3b29967158e98f28b3fc2eeb..78443950888f5571f4ec883260577c4391922640 100644 (file)
--- 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 ded45758978d2d723b3cfc359f66efe805f59477..d6488d42c3d7760689a019ded4395cd3e50edc6e 100644 (file)
--- 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 b39180c6f93ca907092b20806c652235da624ba7..5d0ba61cd973d6aa90622383723b0f9272a36548 100644 (file)
--- 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 15511a01cb7a71102f9101bcdbfa1904f6c221cf..8c79e2091e531a392d29fbe529c3c927507920b7 100644 (file)
--- 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 1bdbbd51ed61fa04769a065ad9224b1998dbc7d9..90ab1c4c37c6fc3b9d8795deb918e0bba591fc69 100644 (file)
--- 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 ae474c0f845e76a67134f0925837c763460b02f4..e8557274662a8efb68c73a83cbcaa066487a7b33 100644 (file)
--- 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 b121bd9b5d77a7175e8bc5dbe5790df629fefd51..b09e24fa22a8cdb6b8188aefec73c8819c6df290 100644 (file)
--- 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 b64f58686db421a1d7e007e7d4e22d70c5fbee5d..2fd60fc4a049a2c44779642a48768f4eff7e2e82 100644 (file)
--- 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 28ae9a0b52b74af18e842d0516865bfc912d2539..e728bb9cfa76409e758390ef5e1778e3302df35c 100644 (file)
--- 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 53eba79bfde6acc155eafc5d0e854036e0c7129f..264629d8782405df855c56b33187901b9b8cffcb 100644 (file)
--- 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 cc9cf32850f7dd520cbd54fc51e2beee8d6ed891..672f1bc59ad7e2078a90456a5cd43f7bc98c26b3 100644 (file)
--- 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 bb7bae1bf674ef7357f1fa166c2ba97faf200878..5bacdb9f9333090cc81b94ec439b3cb2b64d4d61 100644 (file)
--- 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 d9e3cd15811f72a4b407ddc27e849bec4e56bd2a..178ffa4cc4571cfad6f95885a507fa9755bd3354 100644 (file)
--- 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 e7db52f7af9e7325478726e6efffab9d92a40c14..a4dda2fb810a0c57b601e74a642f9c70a5db6b2d 100644 (file)
--- 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 1ae87d05dc0865b4e3ac5a85ad3c4dd048ef6f08..3cff6e001878e7bdd5138c4330c3e0b9784ee192 100644 (file)
--- 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 40b1441a6dff7a80b3570b980ea2bc7ae324ccc8..8ba8f9cc4793f026d0c1b882ee6e7ff61336edff 100644 (file)
--- 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 96f755183ca5040a0983bfb1adb61598244c3b4e..8d0acb9b42acb802947a0db13a68507c3c4be745 100644 (file)
--- 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 07e0da59f2da0632788c3b2259012e93434811bc..34061dd15247c01b34bec312450bb843a3d5deee 100644 (file)
--- 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 79d1115dc53ef452b896c722dcaf1a2a551d62bb..2284f87fc94c7af6f13d88c3ba27b88da54d41f5 100644 (file)
--- 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 78d05046587ca1a2e5318957802fd5e808bd6b81..e6122f8ec64c79342f32a509be8137702a4c905c 100644 (file)
--- 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 800a49dee52663df324f57d7ce65451abf1ebf57..1982f047c109b15ac094da6928ccc0465adcd18a 100644 (file)
--- 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);