Commit 7ac897a5 authored by Richard Gobeille's avatar Richard Gobeille

Duke3d: fix issue with player movement not being locked when crushing shrunken enemies

Fixes #59.
parent 15c084b5
......@@ -3011,6 +3011,12 @@ static int P_CheckLockedMovement(int const playerNum)
auto & thisPlayer = g_player[playerNum];
auto const pPlayer = thisPlayer.ps;
if ((pPlayer->dead_flag && !ud.god) || 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)))
return IL_NOTHING;
if (pPlayer->on_crane >= 0)
return IL_NOMOVE|IL_NOANGLE;
......@@ -3020,12 +3026,6 @@ static int P_CheckLockedMovement(int const playerNum)
if (pPlayer->return_to_center > 0 || thisPlayer.horizRecenter)
return IL_NOHORIZ;
if ((pPlayer->dead_flag && !ud.god) || 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)))
return IL_NOTHING;
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment