From: Samual Lenks Date: Mon, 9 Dec 2013 21:35:32 +0000 (-0500) Subject: Add weaponstartoverride property to weapons X-Git-Tag: xonotic-v0.8.0~152^2~269 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=680a2f11618558901cddf9fc74b15ef07db66e55;p=xonotic%2Fxonotic-data.pk3dir.git Add weaponstartoverride property to weapons --- diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index 0c1fcf37f5..ec7b962bc7 100644 --- 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 58c1724e71..fb8c7db076 100644 --- 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 f2824eed66..b0814fb38b 100644 --- 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 90ab1c4c37..0b1fc5ec26 100644 --- 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 d2d7e9ad83..7a2a7a0ac3 100644 --- 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 019ce9b005..179559712a 100644 --- 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 60ba9f95d8..9fdc970d54 100644 --- 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 6b26ba41c3..cc71080a5d 100644 --- 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 42bf3c110a..eb7491e7d8 100644 --- 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 0100b71dd5..e3907b1795 100644 --- 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 9f773d01bf..d2aaa8a8f1 100644 --- 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 c828cada2b..102c24b806 100644 --- 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 3e3744e74d..2ebb0a7a52 100644 --- 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 c2eaadd0e7..b6a4da15d8 100644 --- 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 0dd5e4e5be..ee246a89b6 100644 --- 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 7d2aff27ac..c92bbf35f5 100644 --- 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 f27c2deaca..c4dc163d86 100644 --- 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 69819bcedc..21ed3815b3 100644 --- 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 4f1e6c99ca..50ee4c81d0 100644 --- 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)