lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'exit-move-lj' into 'master' 

No more drowning with exitmove now.

See merge request STJr/SRB2Internal!563
This commit is contained in:
LJ Sonic 2019-11-27 08:17:22 -05:00
parent 9a1dd06776 032f53ce07
commit c29540a201
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_mobj.c
View File

@ -3408,7 +3408,7 @@ void P_MobjCheckWater(mobj_t *mobj)
// Drown timer setting // Drown timer setting
if ((p->powers[pw_shield] & SH_PROTECTWATER) // Has water protection if ((p->powers[pw_shield] & SH_PROTECTWATER) // Has water protection
|| (p->exiting) // Or exiting || (p->exiting) || (p->pflags & PF_FINISHED) // Or finished/exiting
|| (maptol & TOL_NIGHTS) // Or in NiGHTS mode || (maptol & TOL_NIGHTS) // Or in NiGHTS mode
|| (mariomode)) // Or in Mario mode... || (mariomode)) // Or in Mario mode...
{ {

6
src/p_user.c
View File

@ -2164,6 +2164,10 @@ void P_DoPlayerFinish(player_t *player)
if (netgame) if (netgame)
CONS_Printf(M_GetText("%s has completed the level.\n"), player_names[player-players]); CONS_Printf(M_GetText("%s has completed the level.\n"), player_names[player-players]);
player->powers[pw_underwater] = 0;
player->powers[pw_spacetime] = 0;
P_RestoreMusic(player);
} }
// //
@ -2883,7 +2887,7 @@ static void P_CheckUnderwaterAndSpaceTimer(player_t *player)
{ {
tic_t timeleft = (player->powers[pw_spacetime]) ? player->powers[pw_spacetime] : player->powers[pw_underwater]; tic_t timeleft = (player->powers[pw_spacetime]) ? player->powers[pw_spacetime] : player->powers[pw_underwater];
if (player->exiting) if (player->exiting || (player->pflags & PF_FINISHED))
player->powers[pw_underwater] = player->powers[pw_spacetime] = 0; player->powers[pw_underwater] = player->powers[pw_spacetime] = 0;
timeleft--; // The original code was all n*TICRATE + 1, so let's remove 1 tic for simplicity timeleft--; // The original code was all n*TICRATE + 1, so let's remove 1 tic for simplicity