From e641c82cdcfecab7f3fdddbeb8424b2ae5bc0f6c Mon Sep 17 00:00:00 2001 From: "Richard C. Gobeille" Date: Wed, 17 Jun 2020 21:44:21 +1000 Subject: [PATCH] RR: fix issue where the player was unable to look or move under some circumstances after being "killed" with god mode enabled Replicates changes to Duke3D code from 5e4fd35738c0822c3898ec6453f917ecef436424. --- source/rr/src/player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp index 381d95a89..d6cd8a9f2 100644 --- a/source/rr/src/player.cpp +++ b/source/rr/src/player.cpp @@ -3184,7 +3184,7 @@ static int P_CheckLockedMovement(int const playerNum) auto &thisPlayer = g_player[playerNum]; auto const pPlayer = thisPlayer.ps; - 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))) @@ -7922,7 +7922,7 @@ check_enemy_sprite: if (g_levelTextTime > 0) g_levelTextTime--; - if (pSprite->extra <= 0) + if (pSprite->extra <= 0 && !ud.god) { P_Dead(playerNum, sectorLotag, floorZ, ceilZ); return;