teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-25 13:31:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Tidy up UpdatePlayerSprite() a bit.

Browse source
This commit is contained in:
Mitchell Richters 2022-12-29 14:26:13 +11:00
parent 774c7795b1
commit 7593114fc7
1 changed files with 9 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1829,47 +1829,10 @@ void UpdatePlayerUnderSprite(PLAYER* pp)
void UpdatePlayerSprite(PLAYER* pp)
{
DSWActor* actor = pp->actor;
if (!actor) return;
// there are multiple death functions
if (pp->Flags & (PF_DEAD))
// Adjust player height according to the next action.
if (!(pp->Flags & PF_DEAD))
{
ChangeActorSect(pp->actor, pp->cursector);
UpdatePlayerUnderSprite(pp);
return;
}
if (pp->sop_control)
{
pp->height = PLAYER_HEIGHTF;
}
else if (pp->DoPlayerAction == DoPlayerCrawl)
{
pp->height = PLAYER_CRAWL_HEIGHTF;
}
else if (pp->DoPlayerAction == DoPlayerWade)
{
pp->height = PLAYER_HEIGHTF;
if (pp->WadeDepth > Z(29))
{
DoPlayerSpriteBob(pp, pp->height, 3, 3);
}
}
else if (pp->DoPlayerAction == DoPlayerDive)
{
pp->height = PLAYER_DIVE_HEIGHTF;
}
else if (pp->DoPlayerAction == DoPlayerFly)
{
// bobbing and sprite position taken care of in DoPlayerFly
pp->height = PLAYER_HEIGHTF;
DoPlayerSpriteBob(pp, pp->height, 6, 3);
}
else
{
pp->height = PLAYER_HEIGHTF;
pp->height = (pp->DoPlayerAction == DoPlayerCrawl) ? PLAYER_CRAWL_HEIGHTF : (pp->DoPlayerAction == DoPlayerDive) ? PLAYER_DIVE_HEIGHTF : PLAYER_HEIGHTF;
}
ChangeActorSect(pp->actor, pp->cursector);
@ -3767,6 +3730,8 @@ void DoPlayerFly(PLAYER* pp)
// Adjust view height moving up and down sectors
DoPlayerViewOffset(pp);
DoPlayerSpriteBob(pp, PLAYER_HEIGHTF, 6, 3);
}
@ -5031,6 +4996,10 @@ void DoPlayerWade(PLAYER* pp)
DoPlayerBeginRun(pp);
return;
}
else if (pp->WadeDepth > Z(29))
{
DoPlayerSpriteBob(pp, PLAYER_HEIGHTF, 3, 3);
}
}