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

- Exhumed: Clean up player accesses in map.cpp and move.cpp.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-04 13:58:02 +11:00
parent 3d7b7f8a3e
commit 2ae3a5362e
2 changed files with 15 additions and 12 deletions
source/games/exhumed/src
map.cppmove.cpp

5
source/games/exhumed/src/map.cpp
View file

@ -45,8 +45,9 @@ void GrabMap()
void UpdateMap() void UpdateMap()
{ {
const auto initsectp = getPlayer(nLocalPlayer)->GetActor()->sector(); const auto pPlayer = getPlayer(nLocalPlayer);
if (initsectp->ceilingpal != 3 || (getPlayer(nLocalPlayer)->nTorch != 0)) { const auto initsectp = pPlayer->GetActor()->sector();
if (initsectp->ceilingpal != 3 || (pPlayer->nTorch != 0)) {
MarkSectorSeen(initsectp); MarkSectorSeen(initsectp);
} }
} }

22
source/games/exhumed/src/move.cpp
View file

@ -231,9 +231,10 @@ Collision movespritez(DExhumedActor* pActor, double z, double height, double cli
*overridesect = pSector; *overridesect = pSector;
const auto pSect2 = pSector; const auto pSect2 = pSector;
const auto pPlayer = (pActor->spr.statnum == 100) ? getPlayer(GetPlayerFromActor(pActor)) : nullptr;
if (pActor->spr.statnum == 100) if (pPlayer)
getPlayer(GetPlayerFromActor(pActor))->bTouchFloor = false; pPlayer->bTouchFloor = false;
// backup cstat // backup cstat
const auto cstat = pActor->spr.cstat; const auto cstat = pActor->spr.cstat;
@ -305,8 +306,8 @@ Collision movespritez(DExhumedActor* pActor, double z, double height, double cli
{ {
if (z > 0) if (z > 0)
{ {
if (pActor->spr.statnum == 100) if (pPlayer)
getPlayer(GetPlayerFromActor(pActor))->bTouchFloor = true; pPlayer->bTouchFloor = true;
if (loHit.type == kHitSprite) if (loHit.type == kHitSprite)
{ {
@ -436,16 +437,16 @@ Collision movesprite(DExhumedActor* pActor, DVector2 vect, double dz, double flo
if (pActor->spr.statnum == 100) if (pActor->spr.statnum == 100)
{ {
int nPlayer = GetPlayerFromActor(pActor); const auto pPlayer = getPlayer(GetPlayerFromActor(pActor));
DVector2 thrust(0, 0); DVector2 thrust(0, 0);
CheckSectorFloor(overridesect, pActor->spr.pos.Z, thrust); CheckSectorFloor(overridesect, pActor->spr.pos.Z, thrust);
if (!thrust.isZero()) if (!thrust.isZero())
{ {
getPlayer(nPlayer)->nThrust = thrust; pPlayer->nThrust = thrust;
} }
vect += getPlayer(nPlayer)->nThrust; vect += pPlayer->nThrust;
} }
else else
{ {
@ -930,16 +931,17 @@ void SetQuake(DExhumedActor* pActor, int nVal)
{ {
for (int i = 0; i < nTotalPlayers; i++) for (int i = 0; i < nTotalPlayers; i++)
{ {
auto nSqrt = ((getPlayer(i)->GetActor()->spr.pos.XY() - pActor->spr.pos.XY()) * (1. / 16.)).Length(); const auto pPlayer = getPlayer(i);
auto nSqrt = ((pPlayer->GetActor()->spr.pos.XY() - pActor->spr.pos.XY()) * (1. / 16.)).Length();
if (nSqrt) if (nSqrt)
{ {
nVal = clamp(int(nVal / nSqrt), 0, 15); nVal = clamp(int(nVal / nSqrt), 0, 15);
} }
if (nVal > getPlayer(i)->nQuake) if (nVal > pPlayer->nQuake)
{ {
getPlayer(i)->nQuake = nVal; pPlayer->nQuake = nVal;
} }
} }
} }