tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Honor weapon .pickup return value. 

For FreeCS this means CT-team wil no longer be able to pickup the bomb.
This commit is contained in:
CYBERDEViL 2022-01-03 19:12:26 +01:00
parent d3dcb3a12b
commit f6b0b5c348
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/weapons.qc
View File

@ -163,17 +163,21 @@ Weapons_AddItem(base_player pl, int w, int startammo)
if (!value)
return value;
} else {
/* new to our arsenal, so always return TRUE */
g_weapons[w].pickup(TRUE, startammo);
pl.g_items |= g_weapons[w].id;
value = TRUE;
/* new to our arsenal */
if (g_weapons[w].pickup(TRUE, startammo) == TRUE) {
pl.g_items |= g_weapons[w].id;
value = TRUE;
/* it's new, so autoswitch? */
if (pl.activeweapon == 0 && autocvar_sv_forceweapondraw == 1) {
pl.activeweapon = w;
Weapons_Draw();
/* it's new, so autoswitch? */
if (pl.activeweapon == 0 && autocvar_sv_forceweapondraw == 1) {
pl.activeweapon = w;
Weapons_Draw();
} else {
Weapons_PickupNotify(pl, w);
}
} else {
Weapons_PickupNotify(pl, w);
/* cannot pickup this weapon (weapon says no) */
return FALSE;
}
}
}