diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h index 081ddddc29..2009ac9b18 100644 --- a/source/games/exhumed/src/aistuff.h +++ b/source/games/exhumed/src/aistuff.h @@ -228,7 +228,6 @@ DExhumedActor* BuildCreatureChunk(DExhumedActor* pSrc, int nPic, bool bSpecial = double PlotCourseToSprite(DExhumedActor* nSprite1, DExhumedActor* nSprite2); void CheckSectorFloor(sectortype* pSector, double z, DVector2& xy); DAngle GetAngleToSprite(DExhumedActor* nSprite1, DExhumedActor* nSprite2); -DAngle GetWallNormal(walltype* nWall); void MoveSector(sectortype* pSector, DAngle nAngle, DVector2& vel); Collision AngleChase(DExhumedActor* nSprite, DExhumedActor* nSprite2, int ebx, int ecx, DAngle push1); void SetQuake(DExhumedActor* nSprite, int nVal); diff --git a/source/games/exhumed/src/grenade.cpp b/source/games/exhumed/src/grenade.cpp index 614674cb61..2f3a8efcfe 100644 --- a/source/games/exhumed/src/grenade.cpp +++ b/source/games/exhumed/src/grenade.cpp @@ -96,7 +96,7 @@ void ThrowGrenade(int nPlayer, double dz, double push1) auto nMov = movesprite(pActor, vec, dz, 0, CLIPMASK1); if (nMov.type == kHitWall) { - nAngle = GetWallNormal(nMov.hitWall); + nAngle = nMov.hitWall->normalAngle(); BounceGrenade(pActor, nAngle); } } @@ -359,7 +359,7 @@ void AIGrenade::Tick(RunListEvent* ev) // loc_2CF60: if (nMov.type == kHitWall) { - BounceGrenade(pActor, GetWallNormal(nMov.hitWall)); + BounceGrenade(pActor, nMov.hitWall->normalAngle()); } else if (nMov.type == kHitSprite) { diff --git a/source/games/exhumed/src/lion.cpp b/source/games/exhumed/src/lion.cpp index 72acabb059..9053e2cdc7 100644 --- a/source/games/exhumed/src/lion.cpp +++ b/source/games/exhumed/src/lion.cpp @@ -418,7 +418,7 @@ void AILion::Tick(RunListEvent* ev) if (nMov.type == kHitWall) { pActor->nAction = 7; - pActor->spr.Angles.Yaw = (GetWallNormal(nMov.hitWall) + DAngle180).Normalized360(); + pActor->spr.Angles.Yaw = (nMov.hitWall->normalAngle() + DAngle180).Normalized360(); pActor->nCount = RandomSize(4); return; } diff --git a/source/games/exhumed/src/move.cpp b/source/games/exhumed/src/move.cpp index 048093308d..77e9623902 100644 --- a/source/games/exhumed/src/move.cpp +++ b/source/games/exhumed/src/move.cpp @@ -1025,11 +1025,6 @@ Collision AngleChase(DExhumedActor* pActor, DExhumedActor* pActor2, int threshol return movesprite(pActor, vec, zz * 16 + BobVal(zbob) * 2, 0, nClipType); } -DAngle GetWallNormal(walltype* pWall) -{ - return (pWall->delta().Angle() + DAngle90).Normalized360(); -} - //--------------------------------------------------------------------------- // // @@ -1276,7 +1271,7 @@ void AICreatureChunk::Tick(RunListEvent* ev) } else if (nVal.type == kHitWall) { - nAngle = GetWallNormal(nVal.hitWall); + nAngle = nVal.hitWall->normalAngle(); } else { diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 21b3525006..23557077a0 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -770,7 +770,7 @@ static void CheckMovingBlocks(Player* const pPlayer, Collision& nMove, DVector3& else //if (nMove.type == kHitWall) { sect = nMove.hitWall->nextSector(); - nNormal = GetWallNormal(nMove.hitWall); + nNormal = nMove.hitWall->normalAngle(); } // moving blocks - move this to a separate function! diff --git a/source/games/exhumed/src/queen.cpp b/source/games/exhumed/src/queen.cpp index 6d532ba797..9257d550e0 100644 --- a/source/games/exhumed/src/queen.cpp +++ b/source/games/exhumed/src/queen.cpp @@ -601,7 +601,7 @@ void AIQueenEgg::Tick(RunListEvent* ev) default: return; case kHitWall: - nAngle = GetWallNormal(nMov.hitWall); + nAngle = nMov.hitWall->normalAngle(); break; case kHitSprite: nAngle = nMov.actor()->spr.Angles.Yaw; @@ -856,7 +856,7 @@ void AIQueenHead::Tick(RunListEvent* ev) if (nMov.exbits == 0) { if (nMov.type == kHitSprite) nNewAng = nMov.actor()->spr.Angles.Yaw; - else if (nMov.type == kHitWall) nNewAng = GetWallNormal(nMov.hitWall); + else if (nMov.type == kHitWall) nNewAng = nMov.hitWall->normalAngle(); } else if (nMov.exbits == kHitAux2) {