zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Clean up player accesses in AddAmmo().

Browse source
This commit is contained in:
Mitchell Richters 2023-10-04 12:46:23 +11:00 committed by Christoph Oelckers
parent d4b0cb14b4
commit ad5f1d9f7d
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/exhumed/src/gun.cpp
View file

@ -436,7 +436,7 @@ void MoveWeapons(int nPlayer)
if (nWeapon == kWeaponGrenade) if (nWeapon == kWeaponGrenade)
{ {
BuildGrenade(nPlayer); BuildGrenade(nPlayer);
AddAmmo(nPlayer, 4, -1); AddAmmo(pPlayer, 4, -1);
} }
else if (nWeapon == kWeaponMummified) else if (nWeapon == kWeaponMummified)
{ {
@ -866,7 +866,7 @@ loc_flag:
if (nWeapon != kWeaponGrenade) if (nWeapon != kWeaponGrenade)
{ {
if (WeaponInfo[nWeapon].d) { if (WeaponInfo[nWeapon].d) {
AddAmmo(nPlayer, nAmmoType, -1); AddAmmo(pPlayer, nAmmoType, -1);
} }
if (nWeapon == kWeaponM60) { if (nWeapon == kWeaponM60) {

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

@ -417,10 +417,8 @@ void StartDeathSeq(int nPlayer, int nVal)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int AddAmmo(int nPlayer, int nWeapon, int nAmmoAmount) int AddAmmo(DExhumedPlayer* const pPlayer, int nWeapon, int nAmmoAmount)
{ {
const auto pPlayer = getPlayer(nPlayer);
if (!nAmmoAmount) if (!nAmmoAmount)
nAmmoAmount = 1; nAmmoAmount = 1;
@ -752,13 +750,13 @@ static void doPickupWeapon(DExhumedPlayer* pPlayer, DExhumedActor* pPickupActor,
if (pPlayer->nPlayerWeapons & weapFlag) if (pPlayer->nPlayerWeapons & weapFlag)
{ {
if (currentLevel->gameflags & LEVEL_EX_MULTI) if (currentLevel->gameflags & LEVEL_EX_MULTI)
AddAmmo(pPlayer->pnum, WeaponInfo[nWeapon].nAmmoType, nAmount); AddAmmo(pPlayer, WeaponInfo[nWeapon].nAmmoType, nAmount);
} }
else else
{ {
SetNewWeaponIfBetter(pPlayer, nWeapon); SetNewWeaponIfBetter(pPlayer, nWeapon);
pPlayer->nPlayerWeapons |= weapFlag; pPlayer->nPlayerWeapons |= weapFlag;
AddAmmo(pPlayer->pnum, WeaponInfo[nWeapon].nAmmoType, nAmount); AddAmmo(pPlayer, WeaponInfo[nWeapon].nAmmoType, nAmount);
} }
if (nWeapon == 2) if (nWeapon == 2)
@ -848,7 +846,7 @@ void doPlayerItemPickups(DExhumedPlayer* const pPlayer)
case 6: // Speed Loader case 6: // Speed Loader
case 7: // Fuel Canister case 7: // Fuel Canister
case 8: // M - 60 Ammo Belt case 8: // M - 60 Ammo Belt
if (AddAmmo(pPlayer->pnum, ammoArray[nItem - 6], pPickupActor->spr.hitag)) if (AddAmmo(pPlayer, ammoArray[nItem - 6], pPickupActor->spr.hitag))
{ {
if (nItem == 8) CheckClip(pPlayer->pnum); if (nItem == 8) CheckClip(pPlayer->pnum);
doPickupDestroy(pPickupActor, nItem); doPickupDestroy(pPickupActor, nItem);
@ -859,7 +857,7 @@ void doPlayerItemPickups(DExhumedPlayer* const pPlayer)
case 9: // Grenade case 9: // Grenade
case 27: // May not be grenade, needs confirmation case 27: // May not be grenade, needs confirmation
case 55: case 55:
if (AddAmmo(pPlayer->pnum, 4, 1)) if (AddAmmo(pPlayer, 4, 1))
{ {
if (!(pPlayer->nPlayerWeapons & 0x10)) if (!(pPlayer->nPlayerWeapons & 0x10))
{ {
@ -969,7 +967,7 @@ void doPlayerItemPickups(DExhumedPlayer* const pPlayer)
case 37: // Cobra staff ammo case 37: // Cobra staff ammo
case 38: // Raw Energy case 38: // Raw Energy
if (AddAmmo(pPlayer->pnum, nItem - 32, (nItem == 38) ? pPickupActor->spr.hitag : 1)) if (AddAmmo(pPlayer, nItem - 32, (nItem == 38) ? pPickupActor->spr.hitag : 1))
{ {
doPickupDestroy(pPickupActor, nItem); doPickupDestroy(pPickupActor, nItem);
doPickupNotification(pPlayer, nItem, StaticSound[kSoundAmmoPickup]); doPickupNotification(pPlayer, nItem, StaticSound[kSoundAmmoPickup]);

2
source/games/exhumed/src/player.h
View file

@ -140,7 +140,7 @@ extern int nCurStartSprite;
int GetPlayerFromActor(DExhumedActor* actor); int GetPlayerFromActor(DExhumedActor* actor);
void SetPlayerMummified(DExhumedPlayer* const pPlayer, int bIsMummified); void SetPlayerMummified(DExhumedPlayer* const pPlayer, int bIsMummified);
int AddAmmo(int nPlayer, int nWeapon, int nAmmoAmount); int AddAmmo(DExhumedPlayer* const pPlayer, int nWeapon, int nAmmoAmount);
void ShootStaff(int nPlayer); void ShootStaff(int nPlayer);
void updatePlayerTarget(DExhumedPlayer* const pPlayer); void updatePlayerTarget(DExhumedPlayer* const pPlayer);

2
source/games/exhumed/src/ra.cpp
View file

@ -299,7 +299,7 @@ void AIRa::Tick(RunListEvent* ev)
if (pPlayer->nAmmo[kWeaponRing] > 0) if (pPlayer->nAmmo[kWeaponRing] > 0)
{ {
runlist_DamageEnemy(pRa->pTarget, getPlayer(pRa->nPlayer)->GetActor(), BulletInfo[kWeaponRing].nDamage); runlist_DamageEnemy(pRa->pTarget, getPlayer(pRa->nPlayer)->GetActor(), BulletInfo[kWeaponRing].nDamage);
AddAmmo(pPlayer->pnum, kWeaponRing, -WeaponInfo[kWeaponRing].d); AddAmmo(pPlayer, kWeaponRing, -WeaponInfo[kWeaponRing].d);
SetQuake(pActor, 100); SetQuake(pActor, 100);
} }
else else