yquake2/xatrix
0
0
Fork 0
mirror of https://github.com/yquake2/xatrix.git synced 2025-02-24 21:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #41 from BjossiAlfreds/noammo

Browse source 
Fixed broken xatrix weapon no-ammo switching
This commit is contained in:
Yamagi 2019-11-14 09:51:27 +01:00 committed by GitHub
commit f4a27d5eab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/player/weapon.c
View file

@ -298,16 +298,11 @@ NoAmmoWeaponChange(edict_t *ent)
return; return;
} }
if (ent->client->pers.inventory[ITEM_INDEX(FindItem("mag slug"))] && if (ent->client->pers.inventory[ITEM_INDEX(FindItem("cells"))] > 1 &&
ent->client->pers.inventory[ITEM_INDEX(FindItem("phalanx"))])
{
ent->client->newweapon = FindItem("phalanx");
}
if (ent->client->pers.inventory[ITEM_INDEX(FindItem("cells"))] &&
ent->client->pers.inventory[ITEM_INDEX(FindItem("ionripper"))]) ent->client->pers.inventory[ITEM_INDEX(FindItem("ionripper"))])
{ {
ent->client->newweapon = FindItem("ionrippergun"); ent->client->newweapon = FindItem("ionripper");
return;
} }
if (ent->client->pers.inventory[ITEM_INDEX(FindItem("cells"))] && if (ent->client->pers.inventory[ITEM_INDEX(FindItem("cells"))] &&