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

- SW: Death sequence fixes.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-26 19:29:30 +11:00 committed by Christoph Oelckers
parent 88bace9dd7
commit 7624f8b77d
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1488,9 +1488,8 @@ void DoPlayerSetWadeDepth(PLAYER* pp)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void DoPlayerHeight(PLAYER* pp) void DoPlayerHeight(PLAYER* pp, const double scale = PLAYER_NORMAL_FALL_VALUEF)
{ {
constexpr double scale = 0.375;
pp->actor->viewzoffset -= pp->getViewHeightDiff() * scale; pp->actor->viewzoffset -= pp->getViewHeightDiff() * scale;
pp->actor->spr.pos.Z -= (pp->actor->spr.pos.Z - pp->loz) * scale; pp->actor->spr.pos.Z -= (pp->actor->spr.pos.Z - pp->loz) * scale;
} }
@ -6324,16 +6323,12 @@ void DoPlayerDeathFlip(PLAYER* pp)
{ {
DoPlayerDeathJump(pp); DoPlayerDeathJump(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 0.8952); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 0.8952);
if (MoveSkip2 == 0)
DoJump(pp->actor);
} }
if ((pp->Flags & PF_FALLING)) if ((pp->Flags & PF_FALLING))
{ {
DoPlayerDeathFall(pp); DoPlayerDeathFall(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 1.79); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 1.79);
if (MoveSkip2 == 0)
DoFall(pp->actor);
} }
} }
else else
@ -6342,6 +6337,7 @@ void DoPlayerDeathFlip(PLAYER* pp)
} }
DoPlayerDeathCheckKeys(pp); DoPlayerDeathCheckKeys(pp);
if (pp->height == PLAYER_DEATH_HEIGHTF) DoPlayerHeight(pp, PLAYER_DEATH_FALL_VALUEF);
} }
@ -6367,15 +6363,11 @@ void DoPlayerDeathDrown(PLAYER* pp)
{ {
DoPlayerDeathJump(pp); DoPlayerDeathJump(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 0.8952); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 0.8952);
if (MoveSkip2 == 0)
DoJump(pp->actor);
} }
if ((pp->Flags & PF_FALLING)) if ((pp->Flags & PF_FALLING))
{ {
pp->posZadd(2); pp->posZadd(2);
if (MoveSkip2 == 0)
actor->spr.pos.Z += 4;
// Stick like glue when you hit the ground // Stick like glue when you hit the ground
if (pp->posZget() > pp->loz - PLAYER_DEATH_HEIGHTF) if (pp->posZget() > pp->loz - PLAYER_DEATH_HEIGHTF)
@ -6388,6 +6380,7 @@ void DoPlayerDeathDrown(PLAYER* pp)
DoPlayerDeathFollowKiller(pp); DoPlayerDeathFollowKiller(pp);
DoPlayerDeathCheckKeys(pp); DoPlayerDeathCheckKeys(pp);
if (pp->height == PLAYER_DEATH_HEIGHTF) DoPlayerHeight(pp, PLAYER_DEATH_FALL_VALUEF);
} }
@ -6477,8 +6470,13 @@ void DoPlayerDeathCrumble(PLAYER* pp)
} }
DoPlayerDeathCheckKeys(pp); DoPlayerDeathCheckKeys(pp);
plActor->spr.pos.Z = pp->posZget() + PLAYER_DEAD_HEAD_FLOORZ_OFFSET;
DoPlayerHeadDebris(pp); DoPlayerHeadDebris(pp);
if (pp->height == PLAYER_DEATH_HEIGHTF)
{
pp->loz = pp->actor->user.loz - PLAYER_DEAD_HEAD_FLOORZ_OFFSET;
DoPlayerHeight(pp, PLAYER_DEATH_FALL_VALUEF);
}
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -6536,8 +6534,13 @@ void DoPlayerDeathExplode(PLAYER* pp)
} }
DoPlayerDeathCheckKeys(pp); DoPlayerDeathCheckKeys(pp);
plActor->spr.pos.Z = pp->posZget() + PLAYER_DEAD_HEAD_FLOORZ_OFFSET;
DoPlayerHeadDebris(pp); DoPlayerHeadDebris(pp);
if (pp->height == PLAYER_DEATH_HEIGHTF)
{
pp->loz = pp->actor->user.loz - PLAYER_DEAD_HEAD_FLOORZ_OFFSET;
DoPlayerHeight(pp, PLAYER_DEATH_FALL_VALUEF);
}
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

6
source/games/sw/src/player.h
View file

@ -112,11 +112,15 @@ constexpr double PLAYER_FALL_HEIGHTF = 28;
// dead head height - used in DeathFall // dead head height - used in DeathFall
#define PLAYER_DEATH_HEIGHT (Z(16)) #define PLAYER_DEATH_HEIGHT (Z(16))
constexpr double PLAYER_DEATH_HEIGHTF = 16; constexpr double PLAYER_DEATH_HEIGHTF = 16;
constexpr double PLAYER_DEAD_HEAD_FLOORZ_OFFSET = 7; constexpr double PLAYER_DEAD_HEAD_FLOORZ_OFFSET = PLAYER_DEATH_HEIGHTF * 0.5;
constexpr double PLAYER_NINJA_XREPEAT = 0.734375; constexpr double PLAYER_NINJA_XREPEAT = 0.734375;
constexpr double PLAYER_NINJA_YREPEAT = 0.515625; constexpr double PLAYER_NINJA_YREPEAT = 0.515625;
// Fall rates
constexpr double PLAYER_NORMAL_FALL_VALUEF = (96. / 256.);
constexpr double PLAYER_DEATH_FALL_VALUEF = PLAYER_NORMAL_FALL_VALUEF * 0.5;
BEGIN_SW_NS BEGIN_SW_NS
int SetVisHigh(void); int SetVisHigh(void);