From 694cf10c4553781f643c098411e95e38ba05a94d Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 3 Jun 2020 20:37:58 +1000 Subject: [PATCH] Rename the weapon swap cvar to g_allow_noncore_weapons for future proofing --- qcsrc/common/weapons/weapon/hlac.qc | 2 +- qcsrc/common/weapons/weapon/minelayer.qc | 2 +- qcsrc/common/weapons/weapon/rifle.qc | 2 +- qcsrc/common/weapons/weapon/seeker.qc | 2 +- qcsrc/server/autocvars.qh | 2 +- qcsrc/server/g_world.qc | 2 +- xonotic-server.cfg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 950612f9f..508fa7e65 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -4,7 +4,7 @@ METHOD(HLAC, m_spawnfunc_hookreplace, Weapon(HLAC this, entity e)) { - if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) + if (autocvar_g_allow_noncore_weapons && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { return WEP_CRYLINK; } diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index ac3a57a92..40ea2fb5c 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -4,7 +4,7 @@ METHOD(MineLayer, m_spawnfunc_hookreplace, Weapon(MineLayer this, entity e)) { - if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) + if (autocvar_g_allow_noncore_weapons && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { return WEP_MORTAR; } diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index 6de0cca91..ddf7990e5 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -4,7 +4,7 @@ METHOD(Rifle, m_spawnfunc_hookreplace, Weapon(Rifle this, entity e)) { - if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) + if (autocvar_g_allow_noncore_weapons && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { return WEP_VORTEX; } diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index 7b6b3e3e2..f8bb7a045 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -4,7 +4,7 @@ METHOD(Seeker, m_spawnfunc_hookreplace, Weapon(Seeker this, entity e)) { - if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) + if (autocvar_g_allow_noncore_weapons && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { return WEP_HAGAR; } diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index de0609ccf..0f31b7b29 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -328,7 +328,7 @@ string autocvar_sv_motd; int autocvar_sv_name_maxlength = 64; bool autocvar_sv_precacheplayermodels; bool autocvar_sv_q3acompat_machineshotgunswap; -bool autocvar_sv_nexuizcompat_weaponswap = true; +bool autocvar_g_allow_noncore_weapons = true; bool autocvar_sv_servermodelsonly; int autocvar_sv_spectate; float autocvar_sv_spectator_speed_multiplier; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index a83aac7a9..bb2cdc2f9 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -413,6 +413,7 @@ void cvar_changes_init() BADCVAR("capturelimit_override"); BADCVAR("fraglimit_override"); BADCVAR("gametype"); + BADCVAR("g_allow_noncore_weapons"); BADCVAR("g_antilag"); BADCVAR("g_balance_teams"); BADCVAR("g_balance_teams_prevent_imbalance"); @@ -484,7 +485,6 @@ void cvar_changes_init() BADCVAR("sv_vote_master_commands"); BADCVAR("sv_vote_master_password"); BADCVAR("sv_vote_simple_majority_factor"); - BADCVAR("sv_nexuizcompat_weaponswap"); BADCVAR("teamplay_mode"); BADCVAR("timelimit_override"); BADPREFIX("g_warmup_"); diff --git a/xonotic-server.cfg b/xonotic-server.cfg index fb1d89a40..bb3852d0a 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -496,7 +496,7 @@ sv_gameplayfix_nogravityonground 1 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping machinegun and shotgun (for Q3A map compatibility in mapinfo files)" set sv_q3defragcompat 0 "toggle for some compatibility hacks (for Q3DF map compatibility)" -set sv_nexuizcompat_weaponswap 1 "automatically replace legacy Nexuiz weapons with Xonotic counterparts, not applied when using the New Toys mutator" +set g_allow_noncore_weapons 1 "automatically replace legacy Nexuiz weapons with Xonotic counterparts, not applied when using the New Toys mutator" set g_movement_highspeed 1 "multiplier scale for movement speed (applies to sv_maxspeed and sv_maxairspeed, also applies to air acceleration when g_movement_highspeed_q3_compat is set to 0)" set g_movement_highspeed_q3_compat 0 "apply speed modifiers to air movement in a more Q3-compatible way (only apply speed buffs and g_movement_highspeed to max air speed, not to acceleration)" -- 2.39.2