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

- Exhumed: Reduce branch depth in CheckMovingBlocks() to make next change more visible.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-24 17:02:58 +11:00
parent 0e39dbfc95
commit 62de240c27
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
source/games/exhumed/src/player.cpp
View file

@ -776,37 +776,34 @@ bool CheckMovingBlocks(Player* const pPlayer, Collision& nMove, DVector3& spr_po
// moving blocks - move this to a separate function!
if (sect != nullptr)
{
if ((sect->hitag == 45) && bTouchFloor)
const auto nDiff = absangle(nNormal, pPlayerActor->spr.Angles.Yaw + DAngle180);
if ((sect->hitag == 45) && bTouchFloor && nDiff <= DAngle45)
{
auto nDiff = absangle(nNormal, pPlayerActor->spr.Angles.Yaw + DAngle180);
pPlayer->pPlayerPushSect = sect;
if (nDiff <= DAngle45)
DVector2 vel = pPlayer->vel;
auto nMyAngle = vel.Angle().Normalized360();
setsectinterpolate(sect);
MoveSector(sect, nMyAngle, vel);
if (pPlayer->nPlayerPushSound <= -1)
{
pPlayer->pPlayerPushSect = sect;
pPlayer->nPlayerPushSound = 1;
int nBlock = pPlayer->pPlayerPushSect->extra;
DExhumedActor* pBlockActor = sBlockInfo[nBlock].pActor;
DVector2 vel = pPlayer->vel;
auto nMyAngle = vel.Angle().Normalized360();
setsectinterpolate(sect);
MoveSector(sect, nMyAngle, vel);
if (pPlayer->nPlayerPushSound <= -1)
{
pPlayer->nPlayerPushSound = 1;
int nBlock = pPlayer->pPlayerPushSect->extra;
DExhumedActor* pBlockActor = sBlockInfo[nBlock].pActor;
D3PlayFX(StaticSound[kSound23], pBlockActor, 0x4000);
}
else
{
pPlayerActor->spr.pos = spr_pos;
ChangeActorSect(pPlayerActor, spr_sect);
}
movesprite(pPlayerActor, vel, zz, -20, CLIPMASK0);
return true;
D3PlayFX(StaticSound[kSound23], pBlockActor, 0x4000);
}
else
{
pPlayerActor->spr.pos = spr_pos;
ChangeActorSect(pPlayerActor, spr_sect);
}
movesprite(pPlayerActor, vel, zz, -20, CLIPMASK0);
return true;
}
}
}