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 loHit global in move.cpp.

Browse source 
* More lazy arg passing via a global...
This commit is contained in:
Mitchell Richters 2023-04-27 21:44:29 +10:00
parent 4c5339274d
commit 78df82e1ed
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ BlockInfo sBlockInfo[kMaxPushBlocks];
TObjPtr<DExhumedActor*> nBodyGunSprite[50];
int nCurBodyGunNum;
Collision loHit, hiHit;
Collision hiHit;
// think this belongs in init.c?
@ -147,7 +147,7 @@ void MoveThings()
//
//---------------------------------------------------------------------------
static int BelowNear(DExhumedActor* pActor, double walldist, sectortype** overridesect)
static int BelowNear(DExhumedActor* pActor, const Collision& loHit, double walldist, sectortype** overridesect)
{
auto pSector = pActor->sector();
double z = pActor->spr.pos.Z;
@ -292,8 +292,8 @@ Collision movespritez(DExhumedActor* pActor, double z, double height, double cli
// This function finds the highest and lowest z coordinates that your clipping BOX can get to.
double sprceiling, sprfloor;
auto pos = pActor->spr.pos.plusZ(-1);
getzrange(pos, pActor->sector(), &sprceiling, hiHit, &sprfloor, loHit, 8., CLIPMASK0);
Collision loHit;
getzrange(pActor->spr.pos.plusZ(-1), pActor->sector(), &sprceiling, hiHit, &sprfloor, loHit, 8., CLIPMASK0);
double mySprfloor = sprfloor;
@ -391,7 +391,7 @@ Collision movespritez(DExhumedActor* pActor, double z, double height, double cli
if (pActor->spr.statnum == 100)
{
nRet.exbits |= BelowNear(pActor, clipdist * 1.5, overridesect);
nRet.exbits |= BelowNear(pActor, loHit, clipdist * 1.5, overridesect);
}
return nRet;