Add the properties to all weapons now

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index d6488d42c3d7760689a019ded4395cd3e50edc6e..0c1fcf37f588801aa40a5fe7e690a0c6c59dbed6 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -24,7 +24,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_ARC, arc, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_ARC, arc, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_ARC, arc, float,  weaponstart, weaponstart)
 
 #ifndef MENUQC
 vector arc_shotorigin[4];

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 5d0ba61cd973d6aa90622383723b0f9272a36548..58c1724e7155bd4bf1f9d0221b0bca78f8bae761 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -27,7 +27,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_BLASTER, blaster, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_BLASTER, blaster, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_BLASTER, blaster, float,  weaponstart, weaponstart)
 
 #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 8c79e2091e531a392d29fbe529c3c927507920b7..f2824eed6618e30d56b1c3245c0d93e32403e202 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -40,7 +40,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_CRYLINK, crylink, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_CRYLINK, crylink, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_CRYLINK, crylink, float,  weaponstart, weaponstart)
 
 #ifdef SVQC
 CRYLINK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index e8557274662a8efb68c73a83cbcaa066487a7b33..d2d7e9ad83dd79994231ec56acd06a4ad0f16176 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -47,7 +47,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_ELECTRO, electro, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_ELECTRO, electro, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_ELECTRO, electro, float,  weaponstart, weaponstart)
 
 #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 b09e24fa22a8cdb6b8188aefec73c8819c6df290..019ce9b0058859e55f91db9bcea3337ed75b34b7 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -37,7 +37,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_FIREBALL, fireball, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_FIREBALL, fireball, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_FIREBALL, fireball, float,  weaponstart, weaponstart)
 
 #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 2fd60fc4a049a2c44779642a48768f4eff7e2e82..60ba9f95d870450b491a66dec7a06a312888a0b4 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -39,7 +39,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_HAGAR, hagar, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_HAGAR, hagar, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_HAGAR, hagar, float,  weaponstart, weaponstart)
 
 #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 e728bb9cfa76409e758390ef5e1778e3302df35c..6b26ba41c3d12817231b27d8f634701875a00a68 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -31,7 +31,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_HLAC, hlac, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_HLAC, hlac, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_HLAC, hlac, float,  weaponstart, weaponstart)
 
 #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 264629d8782405df855c56b33187901b9b8cffcb..42bf3c110aeb6cf60f4685574ef552b50d6f0a7f 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -32,7 +32,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_HOOK, hook, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_HOOK, hook, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_HOOK, hook, float,  weaponstart, weaponstart)
 
 #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 672f1bc59ad7e2078a90456a5cd43f7bc98c26b3..0100b71dd5bcc976365ccf2fafed2e339fd64271 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -38,7 +38,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_UZI, uzi, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_UZI, uzi, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_UZI, uzi, float,  weaponstart, weaponstart)
 
 #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 5bacdb9f9333090cc81b94ec439b3cb2b64d4d61..9f773d01bf3cb3addc007bc4633a0789fc1b5881 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -36,7 +36,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_MINE_LAYER, minelayer, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_MINE_LAYER, minelayer, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_MINE_LAYER, minelayer, float,  weaponstart, weaponstart)
 
 #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 178ffa4cc4571cfad6f95885a507fa9755bd3354..c828cada2b4d0e8b331170523fd902efed5ed153 100644 (file)
--- a/qcsrc/common/weapons/w_minstanex.qc
+++ b/qcsrc/common/weapons/w_minstanex.qc
@@ -30,7 +30,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_MINSTANEX, minstanex, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_MINSTANEX, minstanex, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_MINSTANEX, minstanex, float,  weaponstart, weaponstart)
 
 #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 a4dda2fb810a0c57b601e74a642f9c70a5db6b2d..3e3744e74d42162c8025a520658350b7a64a5318 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -36,7 +36,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_MORTAR, mortar, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_MORTAR, mortar, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_MORTAR, mortar, float,  weaponstart, weaponstart)
 
 #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 3cff6e001878e7bdd5138c4330c3e0b9784ee192..c2eaadd0e787e69446c3c9bf2e60ef043a5d6e7e 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -40,7 +40,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_NEX, nex, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_NEX, nex, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_NEX, nex, float,  weaponstart, weaponstart)
 
 #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 8ba8f9cc4793f026d0c1b882ee6e7ff61336edff..0dd5e4e5be682483048281ae50a3b30f9b0198ea 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -20,7 +20,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_PORTO, porto, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_PORTO, porto, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_PORTO, porto, float,  weaponstart, weaponstart)
 
 #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 8d0acb9b42acb802947a0db13a68507c3c4be745..7d2aff27ac97f1b7da9af46855c7ecc33ab09b09 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -31,7 +31,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_RIFLE, rifle, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_RIFLE, rifle, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_RIFLE, rifle, float,  weaponstart, weaponstart)
 
 #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 34061dd15247c01b34bec312450bb843a3d5deee..f27c2deaca8d9bbf779ee76cfd3ad1586e4152bb 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -65,7 +65,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_SEEKER, seeker, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_SEEKER, seeker, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_SEEKER, seeker, float,  weaponstart, weaponstart)
 
 #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 2284f87fc94c7af6f13d88c3ba27b88da54d41f5..69819bcedc180faf08d724b9e32dc591459fecbe 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -68,7 +68,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_SHOCKWAVE, shockwave, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_SHOCKWAVE, shockwave, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_SHOCKWAVE, shockwave, float,  weaponstart, weaponstart)
 
 #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 e6122f8ec64c79342f32a509be8137702a4c905c..4f1e6c99ca4fd4830a080feb06d1a023109b804c 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -23,7 +23,9 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_TUBA, tuba, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(WEP_TUBA, tuba, string, weaponreplace, weaponreplace) \
+       w_prop(WEP_TUBA, tuba, float,  weaponstart, weaponstart)
 
 #ifdef SVQC
 TUBA_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)