vera/nuclide
4
0
Fork 0
Code Issues32 Pull requests Projects Releases Packages Activity

Server: Disable 'best-weapon' switch when sv_forceweapondraw is 1.

Browse source
This commit is contained in:
Marco Cawthorne 2020-11-19 10:46:09 +01:00
parent df1388f9fc
commit 11d52abec3
1 changed files with 8 additions and 3 deletions

11
src/server/weapons.c
View file

@ -102,7 +102,7 @@ Weapons_AddItem(base_player pl, int w, int startammo)
value = TRUE;
/* it's new, so autoswitch? */
if (pl.activeweapon == 0 && autocvar_sv_forceweapondraw) {
if (pl.activeweapon == 0 && autocvar_sv_forceweapondraw == 1) {
pl.activeweapon = w;
Weapons_Draw();
} else {
@ -119,7 +119,7 @@ Weapons_AddItem(base_player pl, int w, int startammo)
value = g_weapons[w].pickup(TRUE, startammo);
/* it's new, so autoswitch? */
if (pl.activeweapon == 0 && autocvar_sv_forceweapondraw) {
if (pl.activeweapon == 0 && autocvar_sv_forceweapondraw == 1) {
pl.activeweapon = w;
Weapons_Draw();
} else {
@ -136,8 +136,13 @@ Weapons_AddItem(base_player pl, int w, int startammo)
void
Weapons_RemoveItem(base_player pl, int w)
{
if (pl.activeweapon == w)
pl.activeweapon = WEAPON_NONE;
pl.g_items &= ~g_weapons[w].id;
Weapons_SwitchBest(pl);
if (autocvar_sv_forceweapondraw == 1)
Weapons_SwitchBest(pl);
}
void