zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-11 03:01:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Restore original grenade pickup code.

Browse source 
* When I read this against the generic weapon pickup code, it looked similar enough but the grenade's logic is reversed. That is, after picking up the weapon, equip the player. The generic weapon handler equips the player, then gives them ammo.
* Fixes #904.
This commit is contained in:
Mitchell Richters 2023-03-27 18:02:35 +11:00
parent 99e23a8d24
commit 94f188c926
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/games/exhumed/src/player.cpp
View file

@ -911,7 +911,26 @@ void doPlayerItemPickups(Player* const pPlayer)
case 9: // Grenade
case 27: // May not be grenade, needs confirmation
case 55:
doPickupWeapon(pPlayer, pPickupActor, nItem, 4, 1, kSoundAmmoPickup);
if (AddAmmo(pPlayer->nPlayer, 4, 1))
{
if (!(pPlayer->nPlayerWeapons & 0x10))
{
pPlayer->nPlayerWeapons |= 0x10;
SetNewWeaponIfBetter(pPlayer->nPlayer, 4);
}
if (nItem == 55)
{
pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE;
DestroyItemAnim(pPickupActor);
}
else
{
doPickupDestroy(pPickupActor, nItem);
}
doPickupNotification(pPlayer, nItem, StaticSound[kSoundAmmoPickup]);
}
break;
case 10: // Pickable item