zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-29 07:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Duke/RR: fixed player dying when falling from great heights while god mode being on.

Browse source
This commit is contained in:
Christoph Oelckers 2023-11-11 09:45:19 +01:00
parent f4fee750d5
commit 2cf474bddc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/player_d.cpp
View file

@ -707,7 +707,7 @@ static void movement(DDukePlayer* const p, ESyncBits actions, sectortype* psect,
S_StopSound(DUKE_SCREAM, pact); S_StopSound(DUKE_SCREAM, pact);
if (!p->insector() || p->cursector->lotag != 1) if (!p->insector() || p->cursector->lotag != 1)
{ {
if (p->falling_counter > 62) quickkill(p); if (p->falling_counter > 62 && !ud.god) quickkill(p);
else if (p->falling_counter > 9) else if (p->falling_counter > 9)
{ {

2
source/games/duke/src/player_r.cpp
View file

@ -1218,7 +1218,7 @@ static void movement(DDukePlayer* const p, ESyncBits actions, sectortype* psect,
if (!p->insector() || p->cursector->lotag != 1) if (!p->insector() || p->cursector->lotag != 1)
{ {
if (isRRRA()) p->MotoOnGround = 1; if (isRRRA()) p->MotoOnGround = 1;
if (p->falling_counter > 62 || (isRRRA() && p->falling_counter > 2 && p->insector() && p->cursector->lotag == 802)) if ((p->falling_counter > 62 || (isRRRA() && p->falling_counter > 2 && p->insector() && p->cursector->lotag == 802)) && !ud.god)
quickkill(p); quickkill(p);
else if (p->falling_counter > 9) else if (p->falling_counter > 9)