zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-03 15:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: With the input tied to frame rate, disable aiming while the

Browse source 
player is dead, and also disable horizontal aiming while on a ladder.
This commit is contained in:
NY00123 2020-04-11 11:19:06 +03:00 committed by Christoph Oelckers
parent 40ca656f38
commit 120abb1029
1 changed files with 185 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3289,6 +3289,10 @@ void getinput(int const playerNum)
localInput.q16avel = fix16_clamp(fix16_sadd(localInput.q16avel, input.q16avel), fix16_from_int(-MAXANGVEL), fix16_from_int(MAXANGVEL)); localInput.q16avel = fix16_clamp(fix16_sadd(localInput.q16avel, input.q16avel), fix16_from_int(-MAXANGVEL), fix16_from_int(MAXANGVEL));
localInput.q16horz = fix16_clamp(fix16_sadd(localInput.q16horz, input.q16horz), fix16_from_int(-MAXHORIZVEL), fix16_from_int(MAXHORIZVEL)); localInput.q16horz = fix16_clamp(fix16_sadd(localInput.q16horz, input.q16horz), fix16_from_int(-MAXHORIZVEL), fix16_from_int(MAXHORIZVEL));
if (!TEST(pp->Flags, PF_DEAD))
{
if (!TEST(pp->Flags, PF_CLIMBING))
{
if (!TEST(pp->Flags, PF_TURN_180)) if (!TEST(pp->Flags, PF_TURN_180))
{ {
if (TEST_SYNC_KEY(pp, SK_TURN_180)) if (TEST_SYNC_KEY(pp, SK_TURN_180))
@ -3357,6 +3361,7 @@ void getinput(int const playerNum)
sprite[pp->PlayerUnderSprite].ang = fix16_to_int(pp->q16ang); sprite[pp->PlayerUnderSprite].ang = fix16_to_int(pp->q16ang);
} }
} }
}
// Fixme: This should probably be made optional. // Fixme: This should probably be made optional.
if (cl_slopetilting) if (cl_slopetilting)
@ -3497,6 +3502,7 @@ void getinput(int const playerNum)
// add base and offsets // add base and offsets
pp->q16horiz = fix16_clamp((pp->q16horizbase + pp->q16horizoff), fix16_from_int(PLAYER_HORIZ_MIN), fix16_from_int(PLAYER_HORIZ_MAX)); pp->q16horiz = fix16_clamp((pp->q16horizbase + pp->q16horizoff), fix16_from_int(PLAYER_HORIZ_MIN), fix16_from_int(PLAYER_HORIZ_MAX));
}
if (!CommEnabled) if (!CommEnabled)
{ {