zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 20:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Split out player floor actor code.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-24 19:01:35 +11:00
parent 5fc0b25ad5
commit 911c5158d2
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1000,6 +1000,30 @@ static void doPlayerGravity(DExhumedActor* const pPlayerActor)
//
//---------------------------------------------------------------------------
static void updatePlayerFloorActor(Player* const pPlayer)
{
if (nTotalPlayers > 1)
{
if (DExhumedActor* const pFloorActor = pPlayer->pPlayerFloorSprite)
{
const auto pPlayerActor = pPlayer->pActor;
pFloorActor->spr.pos.XY() = pPlayerActor->spr.pos.XY();
pFloorActor->spr.pos.Z = pPlayerActor->sector()->floorz;
if (pFloorActor->sector() != pPlayerActor->sector())
{
ChangeActorSect(pFloorActor, pPlayerActor->sector());
}
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void updatePlayerAction(Player* const pPlayer)
{
const auto pPlayerActor = pPlayer->pActor;
@ -1481,29 +1505,12 @@ void AIPlayer::Tick(RunListEvent* ev)
}
}
// loc_1B1EB
DExhumedActor* pFloorActor = pPlayer->pPlayerFloorSprite;
if (nTotalPlayers > 1 && pFloorActor)
{
pFloorActor->spr.pos.XY() = pPlayerActor->spr.pos.XY();
if (pFloorActor->sector() != pPlayerActor->sector())
{
ChangeActorSect(pFloorActor, pPlayerActor->sector());
}
pFloorActor->spr.pos.Z = pPlayerActor->sector()->floorz;
}
updatePlayerFloorActor(pPlayer);
doPlayerItemPickups(pPlayer);
// CORRECT ? // loc_1BAF9:
if (bTouchFloor)
if (bTouchFloor && pPlayerActor->sector()->lotag > 0)
{
if (pPlayerActor->sector()->lotag > 0)
{
runlist_SignalRun(pPlayerActor->sector()->lotag - 1, nPlayer, &ExhumedAI::TouchFloor);
}
runlist_SignalRun(pPlayerActor->sector()->lotag - 1, nPlayer, &ExhumedAI::TouchFloor);
}
if (spr_sect != pPlayerActor->sector())