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

- SW: Replace remaining Player+ pointer arithmetic with array accesses.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-02 14:21:03 +11:00
parent edd089cc0d
commit 3cc2aa7af4
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/jsector.cpp
View file

@ -376,7 +376,7 @@ void drawroomstotile(const DVector3& pos, DAngle ang, DAngle horiz, sectortype*
void JS_ProcessEchoSpot() void JS_ProcessEchoSpot()
{ {
SWPlayer* pp = Player+screenpeek; SWPlayer* pp = &Player[screenpeek];
int16_t reverb; int16_t reverb;
bool reverb_set = false; bool reverb_set = false;

2
source/games/sw/src/miscactr.cpp
View file

@ -874,7 +874,7 @@ int PachinkoCheckWin(DSWActor* actor)
// Do a possible combo switch // Do a possible combo switch
if (ComboSwitchTest(TAG_COMBO_SWITCH_EVERYTHING, actor->spr.hitag)) if (ComboSwitchTest(TAG_COMBO_SWITCH_EVERYTHING, actor->spr.hitag))
{ {
DoMatchEverything(Player+myconnectindex, actor->spr.hitag, 1); DoMatchEverything(&Player[myconnectindex], actor->spr.hitag, 1);
} }
ActorCoughItem(actor); // I WON! I WON! ActorCoughItem(actor); // I WON! I WON!

4
source/games/sw/src/ninja.cpp
View file

@ -2292,7 +2292,7 @@ void PlayerGameReset(SWPlayer* pp)
PlayerUpdateArmor(pp, 0); PlayerUpdateArmor(pp, 0);
pp->KillerActor = nullptr;; pp->KillerActor = nullptr;;
if (pp == Player+screenpeek) if (pp == &Player[screenpeek])
{ {
videoFadePalette(0,0,0,0); videoFadePalette(0,0,0,0);
} }
@ -2387,7 +2387,7 @@ void InitPlayerSprite(SWPlayer* pp, const DVector3& spawnpos, const DAngle start
memset(pp->InventoryTics,0,sizeof(pp->InventoryTics)); memset(pp->InventoryTics,0,sizeof(pp->InventoryTics));
if (pp == Player+screenpeek) if (pp == &Player[screenpeek])
{ {
videoFadePalette(0,0,0,0); videoFadePalette(0,0,0,0);
} }

2
source/games/sw/src/player.cpp
View file

@ -4103,7 +4103,7 @@ void DoPlayerDivePalette(SWPlayer* pp)
{ {
if (pp != Player + screenpeek) return; if (pp != Player + screenpeek) return;
if ((pp->DeathType == PLAYER_DEATH_DROWN || ((Player+screenpeek)->Flags & PF_DIVING)) && !(pp->Flags & PF_DIVING_IN_LAVA)) if ((pp->DeathType == PLAYER_DEATH_DROWN || (Player[screenpeek].Flags & PF_DIVING)) && !(pp->Flags & PF_DIVING_IN_LAVA))
{ {
SetFadeAmt(pp,-1005,210); // Dive color , org color 208 SetFadeAmt(pp,-1005,210); // Dive color , org color 208
} }