zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Manually merge EDuke32 SVN commit 8539.

Browse source
This commit is contained in:
Mitchell Richters 2020-03-18 07:21:12 +11:00 committed by Christoph Oelckers
parent 63edfcf7c7
commit 71ada1d674
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/rr/src/player.cpp
View file

@ -3167,6 +3167,14 @@ enddisplayweapon:
int32_t g_myAimStat = 0, g_oldAimStat = 0; int32_t g_myAimStat = 0, g_oldAimStat = 0;
int32_t mouseyaxismode = -1; int32_t mouseyaxismode = -1;
static int P_CheckLockedMovement(int const playerNum)
{
auto const pPlayer = g_player[playerNum].ps;
return (pPlayer->fist_incs || pPlayer->transporter_hold > 2 || pPlayer->hard_landing || pPlayer->access_incs > 0 || pPlayer->knee_incs > 0
|| (PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) == TRIPBOMB_WEAPON && pPlayer->kickback_pic > 1
&& pPlayer->kickback_pic < PWEAPON(playerNum, pPlayer->curr_weapon, FireDelay)));
}
void P_GetInput(int playerNum) void P_GetInput(int playerNum)
{ {
auto const pPlayer = g_player[playerNum].ps; auto const pPlayer = g_player[playerNum].ps;
@ -8183,9 +8191,7 @@ check_enemy_sprite:
} }
} }
if (pPlayer->fist_incs || pPlayer->transporter_hold > 2 || pPlayer->hard_landing || pPlayer->access_incs > 0 || if (P_CheckLockedMovement(playerNum))
pPlayer->knee_incs > 0 || (!RR && pPlayer->curr_weapon == TRIPBOMB_WEAPON &&
*weaponFrame > 1 && *weaponFrame < 4))
{ {
velocityModifier = 0; velocityModifier = 0;
pPlayer->vel.x = 0; pPlayer->vel.x = 0;
@ -9258,9 +9264,7 @@ void P_DHProcessInput(int playerNum)
} }
} }
if (pPlayer->fist_incs || pPlayer->transporter_hold > 2 || pPlayer->hard_landing || pPlayer->access_incs > 0 || if (P_CheckLockedMovement(playerNum))
pPlayer->knee_incs > 0 || (!RR && pPlayer->curr_weapon == TRIPBOMB_WEAPON &&
*weaponFrame > 1 && *weaponFrame < 4))
{ {
velocityModifier = 0; velocityModifier = 0;
pPlayer->vel.x = 0; pPlayer->vel.x = 0;