mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-11 07:11:39 +00:00
Manually merge missed aliasing from EDuke32 SVN commit 8555.
This commit is contained in:
parent
8bef451ed9
commit
88502f9962
1 changed files with 3 additions and 3 deletions
|
@ -8441,7 +8441,7 @@ check_enemy_sprite:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pPlayer->vel.x || pPlayer->vel.y || g_player[playerNum].input->fvel || g_player[playerNum].input->svel)
|
if (pPlayer->vel.x || pPlayer->vel.y || thisPlayer.input->fvel || thisPlayer.input->svel)
|
||||||
{
|
{
|
||||||
pPlayer->crack_time = 777;
|
pPlayer->crack_time = 777;
|
||||||
|
|
||||||
|
@ -9450,7 +9450,7 @@ void P_DHProcessInput(int playerNum)
|
||||||
else if (thisPlayer.input->q16avel)
|
else if (thisPlayer.input->q16avel)
|
||||||
pPlayer->crack_time = 777;
|
pPlayer->crack_time = 777;
|
||||||
|
|
||||||
if (pPlayer->vel.x || pPlayer->vel.y || g_player[playerNum].input->fvel || g_player[playerNum].input->svel)
|
if (pPlayer->vel.x || pPlayer->vel.y || thisPlayer.input->fvel || thisPlayer.input->svel)
|
||||||
{
|
{
|
||||||
pPlayer->crack_time = 777;
|
pPlayer->crack_time = 777;
|
||||||
|
|
||||||
|
@ -9535,7 +9535,7 @@ void P_DHProcessInput(int playerNum)
|
||||||
|
|
||||||
if (pPlayer->jetpack_on == 0)
|
if (pPlayer->jetpack_on == 0)
|
||||||
{
|
{
|
||||||
if (g_player[playerNum].input->fvel && pPlayer->on_ground)
|
if (thisPlayer.input->fvel && pPlayer->on_ground)
|
||||||
{
|
{
|
||||||
pPlayer->pycount += 64;
|
pPlayer->pycount += 64;
|
||||||
pPlayer->pycount &= 2047;
|
pPlayer->pycount &= 2047;
|
||||||
|
|
Loading…
Reference in a new issue