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

- Exhumed: Return early in movesprite() if the actor's sector is null.

Browse source 
* This is what PowerSlaveGDX does.
* Fixes #1010.
This commit is contained in:
Mitchell Richters 2023-11-08 15:34:40 +11:00
parent 6c70211238
commit 3496d5cac5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -421,17 +421,21 @@ Collision movesprite(DExhumedActor* pActor, DVector2 vect, double dz, double flo
auto spos = pActor->spr.pos;
double nSpriteHeight = GetActorHeight(pActor);
auto pSector = pActor->sector();
assert(pSector);
Collision nRet{};
double floorZ = pSector->floorz;
if (!pSector)
{
assert(pSector);
return nRet;
}
if ((pSector->Flag & kSectUnderwater) || (floorZ < spos.Z))
if ((pSector->Flag & kSectUnderwater) || (pSector->floorz < spos.Z))
{
vect *= 0.5;
}
sectortype* overridesect;
Collision nRet = movespritez(pActor, dz, nSpriteHeight, pActor->clipdist, &overridesect);
nRet = movespritez(pActor, dz, nSpriteHeight, pActor->clipdist, &overridesect);
pSector = pActor->sector(); // modified in movespritez so re-grab this variable