From 88502f9962cd519c1ef906d822caf7a364b5d2e9 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 18 Mar 2020 12:56:15 +1100 Subject: [PATCH] Manually merge missed aliasing from EDuke32 SVN commit 8555. --- source/rr/src/player.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp index 622a985e5..5d6cde35c 100644 --- a/source/rr/src/player.cpp +++ b/source/rr/src/player.cpp @@ -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;