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

- Exhumed: Fix moving block sound setup to match PowerslaveGDX.

Browse source 
* Setup we had looked wrong by comparison, and it eliminates the last goto in the player tick code!
This commit is contained in:
Mitchell Richters 2023-03-24 17:06:06 +11:00
parent 62de240c27
commit 7fe82690a7
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -752,7 +752,7 @@ void AIPlayer::Damage(RunListEvent* ev)
//
//---------------------------------------------------------------------------
bool CheckMovingBlocks(Player* const pPlayer, Collision& nMove, DVector3& spr_pos, sectortype* spr_sect)
static void CheckMovingBlocks(Player* const pPlayer, Collision& nMove, DVector3& spr_pos, sectortype* spr_sect)
{
const auto pPlayerActor = pPlayer->pActor;
const double zz = pPlayerActor->vel.Z;
@ -788,10 +788,10 @@ bool CheckMovingBlocks(Player* const pPlayer, Collision& nMove, DVector3& spr_po
setsectinterpolate(sect);
MoveSector(sect, nMyAngle, vel);
if (pPlayer->nPlayerPushSound <= -1)
if (pPlayer->nPlayerPushSound == -1)
{
pPlayer->nPlayerPushSound = 1;
int nBlock = pPlayer->pPlayerPushSect->extra;
const int nBlock = pPlayer->pPlayerPushSect->extra;
pPlayer->nPlayerPushSound = nBlock;
DExhumedActor* pBlockActor = sBlockInfo[nBlock].pActor;
D3PlayFX(StaticSound[kSound23], pBlockActor, 0x4000);
@ -803,11 +803,18 @@ bool CheckMovingBlocks(Player* const pPlayer, Collision& nMove, DVector3& spr_po
}
movesprite(pPlayerActor, vel, zz, -20, CLIPMASK0);
return true;
}
else if (pPlayer->nPlayerPushSound != -1)
{
if (pPlayer->pPlayerPushSect != nullptr)
{
StopActorSound(sBlockInfo[pPlayer->pPlayerPushSect->extra].pActor);
}
pPlayer->nPlayerPushSound = -1;
}
}
}
return false;
}
//---------------------------------------------------------------------------
@ -1324,22 +1331,9 @@ void AIPlayer::Tick(RunListEvent* ev)
}
}
if (CheckMovingBlocks(pPlayer, nMove, spr_pos, spr_sect))
goto sectdone;
CheckMovingBlocks(pPlayer, nMove, spr_pos, spr_sect);
}
// loc_1AB46:
if (pPlayer->nPlayerPushSound > -1)
{
if (pPlayer->pPlayerPushSect != nullptr)
{
StopActorSound(sBlockInfo[pPlayer->pPlayerPushSect->extra].pActor);
}
pPlayer->nPlayerPushSound = -1;
}
sectdone:
if (!pPlayer->bPlayerPan && !pPlayer->bLockPan)
{
pPlayer->nDestVertPan = maphoriz((pPlayerActor->spr.pos.Z - spr_pos.Z) * 2.);