zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 11:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fixes #56.
This commit is contained in:
Richard C. Gobeille 2020-06-07 12:15:26 -07:00 committed by Christoph Oelckers
parent 2c2b871083
commit 5e4fd35738
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/duke3d/src/player.cpp
View file

@ -3029,7 +3029,7 @@ static int P_CheckLockedMovement(int const playerNum)
if (pPlayer->return_to_center > 0 || thisPlayer.horizRecenter) if (pPlayer->return_to_center > 0 || thisPlayer.horizRecenter)
return IL_NOHORIZ; 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 || pPlayer->knee_incs > 0
|| (PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) == TRIPBOMB_WEAPON && pPlayer->kickback_pic > 1 || (PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) == TRIPBOMB_WEAPON && pPlayer->kickback_pic > 1
&& pPlayer->kickback_pic < PWEAPON(playerNum, pPlayer->curr_weapon, FireDelay))) && pPlayer->kickback_pic < PWEAPON(playerNum, pPlayer->curr_weapon, FireDelay)))
@ -5051,7 +5051,7 @@ void P_ProcessInput(int playerNum)
if (g_levelTextTime > 0) if (g_levelTextTime > 0)
g_levelTextTime--; g_levelTextTime--;
if (pSprite->extra <= 0) if (pSprite->extra <= 0 && !ud.god)
{ {
P_Dead(playerNum, sectorLotag, floorZ, ceilZ); P_Dead(playerNum, sectorLotag, floorZ, ceilZ);
return; return;