zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 21:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Handle DoPlayerTurn()/DoPlayerHorizon() better while dead.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-07 21:50:43 +10:00
parent 681a8ebec2
commit e1a5e37126
2 changed files with 102 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/sw/src/input.cpp
View file

@ -278,9 +278,9 @@ static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool
if (!cl_syncinput) if (!cl_syncinput)
{ {
if (TEST(pp->Flags2, PF2_INPUT_CAN_TURN)) if (TEST(pp->Flags2, PF2_INPUT_CAN_TURN))
DoPlayerTurn(pp, !TEST(pp->Flags, PF_DEAD) || TEST(pp->Flags, PF_DEAD) && TEST(pp->Flags, PF_DEAD_HEAD|PF_HEAD_CONTROL) ? q16avel : 0, scaleAdjust); DoPlayerTurn(pp, q16avel, scaleAdjust);
if (TEST(pp->Flags2, PF2_INPUT_CAN_AIM)) if (TEST(pp->Flags2, PF2_INPUT_CAN_AIM))
DoPlayerHorizon(pp, !TEST(pp->Flags, PF_DEAD) ? q16horz : 0, scaleAdjust); DoPlayerHorizon(pp, q16horz, scaleAdjust);
} }
loc.fvel = clamp(loc.fvel + fvel, -MAXFVEL, MAXFVEL); loc.fvel = clamp(loc.fvel + fvel, -MAXFVEL, MAXFVEL);

6
source/sw/src/player.cpp
View file

@ -1551,6 +1551,8 @@ DoPlayerCrawlHeight(PLAYERp pp)
void void
DoPlayerTurn(PLAYERp pp, fixed_t const q16avel, double const scaleAdjust) DoPlayerTurn(PLAYERp pp, fixed_t const q16avel, double const scaleAdjust)
{ {
if (!TEST(pp->Flags, PF_DEAD) || TEST(pp->Flags, PF_DEAD) && TEST(pp->Flags, PF_DEAD_HEAD|PF_HEAD_CONTROL))
{
if (!TEST(pp->Flags, PF_TURN_180)) if (!TEST(pp->Flags, PF_TURN_180))
{ {
if (pp->input.actions & SB_TURNAROUND) if (pp->input.actions & SB_TURNAROUND)
@ -1609,6 +1611,7 @@ DoPlayerTurn(PLAYERp pp, fixed_t const q16avel, double const scaleAdjust)
{ {
pp->q16ang = (pp->q16ang + q16avel) & 0x7FFFFFF; pp->q16ang = (pp->q16ang + q16avel) & 0x7FFFFFF;
} }
}
if (!cl_syncinput && pp->angAdjust) if (!cl_syncinput && pp->angAdjust)
{ {
@ -1859,6 +1862,8 @@ PlayerAutoLook(PLAYERp pp, double const scaleAdjust)
void void
DoPlayerHorizon(PLAYERp pp, fixed_t const q16horz, double const scaleAdjust) DoPlayerHorizon(PLAYERp pp, fixed_t const q16horz, double const scaleAdjust)
{ {
if (!TEST(pp->Flags, PF_DEAD))
{
// Fixme: This should probably be made optional. // Fixme: This should probably be made optional.
if (cl_slopetilting) if (cl_slopetilting)
PlayerAutoLook(pp, scaleAdjust); PlayerAutoLook(pp, scaleAdjust);
@ -1923,6 +1928,7 @@ DoPlayerHorizon(PLAYERp pp, fixed_t const q16horz, double const scaleAdjust)
} }
} }
} }
}
// bound the base // bound the base
pp->q16horizbase = max(pp->q16horizbase, IntToFixed(PLAYER_HORIZ_MIN)); pp->q16horizbase = max(pp->q16horizbase, IntToFixed(PLAYER_HORIZ_MIN));