Add weaponstartoverride property to weapons

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

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 58c1724e7155bd4bf1f9d0221b0bca78f8bae761..fb8c7db076618a8704af27b3f0ea4a8d31e1b701 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -29,7 +29,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_BLASTER, blaster, float,  weaponstart, weaponstart)
+       w_prop(WEP_BLASTER, blaster, float,  weaponstart, weaponstart) \
+       w_prop(WEP_BLASTER, blaster, float,  weaponstartoverride, weaponstartoverride)
 
 #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 f2824eed6618e30d56b1c3245c0d93e32403e202..b0814fb38b3fae5d52d8d2736e6ce3034c44c9eb 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -42,7 +42,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_CRYLINK, crylink, float,  weaponstart, weaponstart)
+       w_prop(WEP_CRYLINK, crylink, float,  weaponstart, weaponstart) \
+       w_prop(WEP_CRYLINK, crylink, float,  weaponstartoverride, weaponstartoverride)
 
 #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 90ab1c4c37c6fc3b9d8795deb918e0bba591fc69..0b1fc5ec26598baf05aa8dd50813a139e17f47dd 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -40,7 +40,8 @@ REGISTER_WEAPON(
        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)
+       w_prop(WEP_DEVASTATOR, devastator, float,  weaponstart, weaponstart) \
+       w_prop(WEP_DEVASTATOR, devastator, float,  weaponstartoverride, weaponstartoverride)
 
 #ifdef SVQC
 DEVASTATOR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index d2d7e9ad83dd79994231ec56acd06a4ad0f16176..7a2a7a0ac32f5c8a4c8eff07b7bee730bf652849 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -49,7 +49,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_ELECTRO, electro, float,  weaponstart, weaponstart)
+       w_prop(WEP_ELECTRO, electro, float,  weaponstart, weaponstart) \
+       w_prop(WEP_ELECTRO, electro, float,  weaponstartoverride, weaponstartoverride)
 
 #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 019ce9b0058859e55f91db9bcea3337ed75b34b7..179559712a3a8abba8c53e6dd882b357d7811682 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -39,7 +39,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_FIREBALL, fireball, float,  weaponstart, weaponstart)
+       w_prop(WEP_FIREBALL, fireball, float,  weaponstart, weaponstart) \
+       w_prop(WEP_FIREBALL, fireball, float,  weaponstartoverride, weaponstartoverride)
 
 #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 60ba9f95d870450b491a66dec7a06a312888a0b4..9fdc970d540b8c7c4162ce1090b54b9569474190 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -41,7 +41,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_HAGAR, hagar, float,  weaponstart, weaponstart)
+       w_prop(WEP_HAGAR, hagar, float,  weaponstart, weaponstart) \
+       w_prop(WEP_HAGAR, hagar, float,  weaponstartoverride, weaponstartoverride)
 
 #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 6b26ba41c3d12817231b27d8f634701875a00a68..cc71080a5d4b3815f6cbcf47d5a8aa5e7c301a1a 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -33,7 +33,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_HLAC, hlac, float,  weaponstart, weaponstart)
+       w_prop(WEP_HLAC, hlac, float,  weaponstart, weaponstart) \
+       w_prop(WEP_HLAC, hlac, float,  weaponstartoverride, weaponstartoverride)
 
 #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 42bf3c110aeb6cf60f4685574ef552b50d6f0a7f..eb7491e7d875db1b92529a8beac7dc6e957e6170 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -34,7 +34,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_HOOK, hook, float,  weaponstart, weaponstart)
+       w_prop(WEP_HOOK, hook, float,  weaponstart, weaponstart) \
+       w_prop(WEP_HOOK, hook, float,  weaponstartoverride, weaponstartoverride)
 
 #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 0100b71dd5bcc976365ccf2fafed2e339fd64271..e3907b1795cfad9e1c2282e3e80546819ec99473 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -40,7 +40,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_UZI, uzi, float,  weaponstart, weaponstart)
+       w_prop(WEP_UZI, uzi, float,  weaponstart, weaponstart) \
+       w_prop(WEP_UZI, uzi, float,  weaponstartoverride, weaponstartoverride)
 
 #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 9f773d01bf3cb3addc007bc4633a0789fc1b5881..d2aaa8a8f14764d62c45808da88ba130459df279 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -38,7 +38,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_MINE_LAYER, minelayer, float,  weaponstart, weaponstart)
+       w_prop(WEP_MINE_LAYER, minelayer, float,  weaponstart, weaponstart) \
+       w_prop(WEP_MINE_LAYER, minelayer, float,  weaponstartoverride, weaponstartoverride)
 
 #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 c828cada2b4d0e8b331170523fd902efed5ed153..102c24b80632f62c9cc963c8152a37dbea382baa 100644 (file)
--- a/qcsrc/common/weapons/w_minstanex.qc
+++ b/qcsrc/common/weapons/w_minstanex.qc
@@ -32,7 +32,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  weaponstart, weaponstart)
+       w_prop(WEP_MINSTANEX, minstanex, float,  weaponstart, weaponstart) \
+       w_prop(WEP_MINSTANEX, minstanex, float,  weaponstartoverride, weaponstartoverride)
 
 #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 3e3744e74d42162c8025a520658350b7a64a5318..2ebb0a7a52ff0054dbd78748a28b3624fa2e5fab 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -38,7 +38,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_MORTAR, mortar, float,  weaponstart, weaponstart)
+       w_prop(WEP_MORTAR, mortar, float,  weaponstart, weaponstart) \
+       w_prop(WEP_MORTAR, mortar, float,  weaponstartoverride, weaponstartoverride)
 
 #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 c2eaadd0e787e69446c3c9bf2e60ef043a5d6e7e..b6a4da15d8c28130046e10a5132550193e86b4a7 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -42,7 +42,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_NEX, nex, float,  weaponstart, weaponstart)
+       w_prop(WEP_NEX, nex, float,  weaponstart, weaponstart) \
+       w_prop(WEP_NEX, nex, float,  weaponstartoverride, weaponstartoverride)
 
 #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 0dd5e4e5be682483048281ae50a3b30f9b0198ea..ee246a89b65ce7bc4e28565903ef6f045e07e15d 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -22,7 +22,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_PORTO, porto, float,  weaponstart, weaponstart)
+       w_prop(WEP_PORTO, porto, float,  weaponstart, weaponstart) \
+       w_prop(WEP_PORTO, porto, float,  weaponstartoverride, weaponstartoverride)
 
 #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 7d2aff27ac97f1b7da9af46855c7ecc33ab09b09..c92bbf35f54e1392f4afeaf4d8759b11d676207c 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -33,7 +33,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_RIFLE, rifle, float,  weaponstart, weaponstart)
+       w_prop(WEP_RIFLE, rifle, float,  weaponstart, weaponstart) \
+       w_prop(WEP_RIFLE, rifle, float,  weaponstartoverride, weaponstartoverride)
 
 #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 f27c2deaca8d9bbf779ee76cfd3ad1586e4152bb..c4dc163d867191f60a0a2967292db2f2612f4b0a 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -67,7 +67,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_SEEKER, seeker, float,  weaponstart, weaponstart)
+       w_prop(WEP_SEEKER, seeker, float,  weaponstart, weaponstart) \
+       w_prop(WEP_SEEKER, seeker, float,  weaponstartoverride, weaponstartoverride)
 
 #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 69819bcedc180faf08d724b9e32dc591459fecbe..21ed3815b3f9c61e8133c217a4d046ef8e30159d 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -70,7 +70,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_SHOCKWAVE, shockwave, float,  weaponstart, weaponstart)
+       w_prop(WEP_SHOCKWAVE, shockwave, float,  weaponstart, weaponstart) \
+       w_prop(WEP_SHOCKWAVE, shockwave, float,  weaponstartoverride, weaponstartoverride)
 
 #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 4f1e6c99ca4fd4830a080feb06d1a023109b804c..50ee4c81d037da5d14bbcda66410ba2fce4d5df4 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -25,7 +25,8 @@ REGISTER_WEAPON(
        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, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_TUBA, tuba, float,  weaponstart, weaponstart)
+       w_prop(WEP_TUBA, tuba, float,  weaponstart, weaponstart) \
+       w_prop(WEP_TUBA, tuba, float,  weaponstartoverride, weaponstartoverride)
 
 #ifdef SVQC
 TUBA_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)