teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Manually merge missed aliasing from EDuke32 SVN commit 8555.

Browse source
This commit is contained in:
Mitchell Richters 2020-03-18 12:56:15 +11:00 committed by Christoph Oelckers
parent 8bef451ed9
commit 88502f9962
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
@ -9450,7 +9450,7 @@ void P_DHProcessInput(int playerNum)
else if (thisPlayer.input->q16avel)
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;
@ -9535,7 +9535,7 @@ void P_DHProcessInput(int playerNum)
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 &= 2047;