Commit 15c084b5 authored by Richard Gobeille's avatar Richard Gobeille

Duke3d: fix issue where the player was unable to look or move under some...

Duke3d: fix issue where the player was unable to look or move under some circumstances after being "killed" with god mode enabled

Fixes #56.
parent 66b4971f
......@@ -3020,7 +3020,7 @@ static int P_CheckLockedMovement(int const playerNum)
if (pPlayer->return_to_center > 0 || thisPlayer.horizRecenter)
return IL_NOHORIZ;
if (pPlayer->dead_flag || pPlayer->fist_incs || pPlayer->transporter_hold > 2 || pPlayer->hard_landing || pPlayer->access_incs > 0
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)))
......@@ -5021,7 +5021,7 @@ void P_ProcessInput(int playerNum)
if (g_levelTextTime > 0)
g_levelTextTime--;
if (pSprite->extra <= 0)
if (pSprite->extra <= 0 && !ud.god)
{
P_Dead(playerNum, sectorLotag, floorZ, ceilZ);
return;
......
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