From 3d7b7f8a3e336ad2dd02be9b9dc1988ab5c88efa Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 4 Oct 2023 13:53:11 +1100 Subject: [PATCH] - Exhumed: Clean up player accesses in `items.cpp` and associated utilities. --- source/games/exhumed/src/aistuff.h | 8 +- source/games/exhumed/src/cheats.cpp | 2 +- source/games/exhumed/src/items.cpp | 104 +++++++++++++------------- source/games/exhumed/src/lighting.cpp | 4 +- source/games/exhumed/src/player.cpp | 10 +-- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h index 594e777f2..ef50f3a07 100644 --- a/source/games/exhumed/src/aistuff.h +++ b/source/games/exhumed/src/aistuff.h @@ -156,10 +156,10 @@ extern const int16_t nItemMagic[]; void BuildItemAnim(DExhumedActor* nSprite); void ItemFlash(); -void FillItems(int nPlayer); -void UseItem(int nPlayer, int nItem); +void FillItems(DExhumedPlayer* const pPlayer); +void UseItem(DExhumedPlayer* const pPlayer, int nItem); void UseCurItem(int nPlayer); -int GrabItem(int nPlayer, int nItem); +int GrabItem(DExhumedPlayer* const pPlayer, int nItem); void DropMagic(DExhumedActor* actor); void InitItems(); void StartRegenerate(DExhumedActor* nSprite); @@ -177,7 +177,7 @@ void FuncLava(int, int, int, int); void InitLights(); void AddFlash(sectortype* pSector, const DVector3& pos, int val); -void SetTorch(int nPlayer, int bTorchOnOff); +void SetTorch(DExhumedPlayer* const pPlayer, int bTorchOnOff); void UndoFlashes(); void DoLights(); void AddFlow(sectortype* pSect, int nSpeed, int b, DAngle ang = -minAngle); diff --git a/source/games/exhumed/src/cheats.cpp b/source/games/exhumed/src/cheats.cpp index 85ef20143..bfea379e8 100644 --- a/source/games/exhumed/src/cheats.cpp +++ b/source/games/exhumed/src/cheats.cpp @@ -266,7 +266,7 @@ static void cmd_Give(int player, uint8_t** stream, bool skip) } if (buttons & kButtonCheatItems) // LOBOSWAG cheat { - FillItems(player); + FillItems(pPlayer); if (player == myconnectindex) Printf(PRINT_NOTIFY, "%s\n", GStrings("TXT_EX_ITEMS")); } diff --git a/source/games/exhumed/src/items.cpp b/source/games/exhumed/src/items.cpp index 9bb997e3a..9e2b68316 100644 --- a/source/games/exhumed/src/items.cpp +++ b/source/games/exhumed/src/items.cpp @@ -174,22 +174,22 @@ void ItemFlash() // //--------------------------------------------------------------------------- -void FillItems(int nPlayer) +void FillItems(DExhumedPlayer* const pPlayer) { for (int i = 0; i < 6; i++) { - getPlayer(nPlayer)->items[i] = 5; + pPlayer->items[i] = 5; } - getPlayer(nPlayer)->nMagic = 1000; + pPlayer->nMagic = 1000; - if (nPlayer == nLocalPlayer) + if (pPlayer->pnum == nLocalPlayer) { ItemFlash(); } - if (getPlayer(nPlayer)->nItem == -1) { - getPlayer(nPlayer)->nItem = 0; + if (pPlayer->nItem == -1) { + pPlayer->nItem = 0; } } @@ -199,20 +199,20 @@ void FillItems(int nPlayer) // //--------------------------------------------------------------------------- -static bool UseEye(int nPlayer) +static bool UseEye(DExhumedPlayer* const pPlayer) { - if (getPlayer(nPlayer)->nInvisible >= 0) - getPlayer(nPlayer)->nInvisible = 900; + if (pPlayer->nInvisible >= 0) + pPlayer->nInvisible = 900; - auto pActor = getPlayer(nPlayer)->GetActor(); + auto pActor = pPlayer->GetActor(); pActor->spr.cstat |= CSTAT_SPRITE_INVISIBLE; - if (getPlayer(nPlayer)->pPlayerFloorSprite != nullptr) { + if (pPlayer->pPlayerFloorSprite != nullptr) { pActor->spr.cstat |= CSTAT_SPRITE_INVISIBLE; } - if (nPlayer == nLocalPlayer) + if (pPlayer->pnum == nLocalPlayer) { ItemFlash(); D3PlayFX(StaticSound[kSound31], pActor); @@ -226,14 +226,14 @@ static bool UseEye(int nPlayer) // //--------------------------------------------------------------------------- -static bool UseMask(int nPlayer) +static bool UseMask(DExhumedPlayer* const pPlayer) { - getPlayer(nPlayer)->nMaskAmount = 1350; - getPlayer(nPlayer)->nAir = 100; + pPlayer->nMaskAmount = 1350; + pPlayer->nAir = 100; - if (nPlayer == nLocalPlayer) + if (pPlayer->pnum == nLocalPlayer) { - D3PlayFX(StaticSound[kSound31], getPlayer(nPlayer)->GetActor()); + D3PlayFX(StaticSound[kSound31], pPlayer->GetActor()); } return true; } @@ -244,14 +244,14 @@ static bool UseMask(int nPlayer) // //--------------------------------------------------------------------------- -bool UseTorch(int nPlayer) +bool UseTorch(DExhumedPlayer* const pPlayer) { - if (!getPlayer(nPlayer)->nTorch) + if (!pPlayer->nTorch) { - SetTorch(nPlayer, 1); + SetTorch(pPlayer, 1); } - getPlayer(nPlayer)->nTorch = 900; + pPlayer->nTorch = 900; return true; } @@ -261,15 +261,15 @@ bool UseTorch(int nPlayer) // //--------------------------------------------------------------------------- -bool UseHeart(int nPlayer) +bool UseHeart(DExhumedPlayer* const pPlayer) { - if (getPlayer(nPlayer)->nHealth < kMaxHealth) { - getPlayer(nPlayer)->nHealth = kMaxHealth; + if (pPlayer->nHealth < kMaxHealth) { + pPlayer->nHealth = kMaxHealth; - if (nPlayer == nLocalPlayer) + if (pPlayer->pnum == nLocalPlayer) { ItemFlash(); - D3PlayFX(StaticSound[kSound31], getPlayer(nPlayer)->GetActor()); + D3PlayFX(StaticSound[kSound31], pPlayer->GetActor()); } return true; } @@ -282,28 +282,28 @@ bool UseHeart(int nPlayer) // //--------------------------------------------------------------------------- -bool UseScarab(int nPlayer) +bool UseScarab(DExhumedPlayer* const pPlayer) { - if (getPlayer(nPlayer)->invincibility >= 0 && getPlayer(nPlayer)->invincibility < 900) - getPlayer(nPlayer)->invincibility = 900; + if (pPlayer->invincibility >= 0 && pPlayer->invincibility < 900) + pPlayer->invincibility = 900; - if (nPlayer == nLocalPlayer) + if (pPlayer->pnum == nLocalPlayer) { ItemFlash(); - D3PlayFX(StaticSound[kSound31], getPlayer(nPlayer)->GetActor()); + D3PlayFX(StaticSound[kSound31], pPlayer->GetActor()); } return true; } // faster firing -static bool UseHand(int nPlayer) +static bool UseHand(DExhumedPlayer* const pPlayer) { - getPlayer(nPlayer)->nDouble = 1350; + pPlayer->nDouble = 1350; - if (nPlayer == nLocalPlayer) + if (pPlayer->pnum == nLocalPlayer) { ItemFlash(); - D3PlayFX(StaticSound[kSound31], getPlayer(nPlayer)->GetActor()); + D3PlayFX(StaticSound[kSound31], pPlayer->GetActor()); } return true; } @@ -314,36 +314,36 @@ static bool UseHand(int nPlayer) // //--------------------------------------------------------------------------- -void UseItem(int nPlayer, int nItem) +void UseItem(DExhumedPlayer* const pPlayer, int nItem) { bool didit = false; switch (nItem) { case 0: - didit = UseHeart(nPlayer); + didit = UseHeart(pPlayer); break; case 1: - didit = UseScarab(nPlayer); + didit = UseScarab(pPlayer); break; case 2: - didit = UseTorch(nPlayer); + didit = UseTorch(pPlayer); break; case 3: - didit = UseHand(nPlayer); + didit = UseHand(pPlayer); break; case 4: - didit = UseEye(nPlayer); + didit = UseEye(pPlayer); break; case 5: - didit = UseMask(nPlayer); + didit = UseMask(pPlayer); break; default: break; } if (!didit) return; - getPlayer(nPlayer)->items[nItem]--; - int nItemCount = getPlayer(nPlayer)->items[nItem]; + pPlayer->items[nItem]--; + int nItemCount = pPlayer->items[nItem]; int nMagic = nItemMagic[nItem]; @@ -351,7 +351,7 @@ void UseItem(int nPlayer, int nItem) { for (nItem = 0; nItem < 6; nItem++) { - if (getPlayer(nPlayer)->items[nItem] > 0) { + if (pPlayer->items[nItem] > 0) { break; } } @@ -361,8 +361,8 @@ void UseItem(int nPlayer, int nItem) } } - getPlayer(nPlayer)->nMagic -= nMagic; - getPlayer(nPlayer)->nItem = nItem; + pPlayer->nMagic -= nMagic; + pPlayer->nItem = nItem; } //--------------------------------------------------------------------------- @@ -371,16 +371,16 @@ void UseItem(int nPlayer, int nItem) // //--------------------------------------------------------------------------- -int GrabItem(int nPlayer, int nItem) +int GrabItem(DExhumedPlayer* const pPlayer, int nItem) { - if (getPlayer(nPlayer)->items[nItem] >= 5) { + if (pPlayer->items[nItem] >= 5) { return 0; } - getPlayer(nPlayer)->items[nItem]++; + pPlayer->items[nItem]++; - if (getPlayer(nPlayer)->nItem < 0 || nItem == getPlayer(nPlayer)->nItem) { - getPlayer(nPlayer)->nItem = nItem; + if (pPlayer->nItem < 0 || nItem == pPlayer->nItem) { + pPlayer->nItem = nItem; } return 1; diff --git a/source/games/exhumed/src/lighting.cpp b/source/games/exhumed/src/lighting.cpp index fce9af8c2..250535b2e 100644 --- a/source/games/exhumed/src/lighting.cpp +++ b/source/games/exhumed/src/lighting.cpp @@ -783,13 +783,13 @@ void DoLights() // //--------------------------------------------------------------------------- -void SetTorch(int nPlayer, int bTorchOnOff) +void SetTorch(DExhumedPlayer* const pPlayer, int bTorchOnOff) { if (bTorchOnOff == bTorch) { return; } - if (nPlayer != nLocalPlayer) { + if (pPlayer->pnum != nLocalPlayer) { return; } diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 72d7b72e9..1aecfe0bb 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -298,7 +298,7 @@ void RestartPlayer(int nPlayer) pPlayer->nQuake = 0; pPlayer->nTemperature = 0; pPlayer->nStandHeight = GetActorHeight(pPlayerActor); - SetTorch(nPlayer, 0); + SetTorch(pPlayer, 0); if (nNetPlayerCount) pPlayer->nHealth = 1600; // TODO - define @@ -925,7 +925,7 @@ void doPlayerItemPickups(DExhumedPlayer* const pPlayer) case 21: // Unseen eye(Invisibility) case 22: // Torch case 23: // Sobek Mask - if (GrabItem(pPlayer->pnum, itemArray[nItem - 18])) + if (GrabItem(pPlayer, itemArray[nItem - 18])) { doPickupDestroy(pPickupActor, nItem); doPickupNotification(pPlayer, nItem); @@ -1149,7 +1149,7 @@ static void updatePlayerInventory(DExhumedPlayer* const pPlayer) if (pPlayer->items[i] > 0 && nItemMagic[i] <= pPlayer->nMagic) { - UseItem(pPlayer->pnum, i); + UseItem(pPlayer, i); break; } } @@ -1348,7 +1348,7 @@ static void doPlayerCounters(DExhumedPlayer* const pPlayer) if (pPlayer->nTorch == 0) { - SetTorch(pPlayer->pnum, 0); + SetTorch(pPlayer, 0); } else if (!bConsolePlayer) { @@ -1471,7 +1471,7 @@ static void doPlayerUnderwater(DExhumedPlayer* const pPlayer, const bool oUnderw if (pPlayer->nTorch > 0) { pPlayer->nTorch = 0; - SetTorch(pPlayer->pnum, 0); + SetTorch(pPlayer, 0); } } else