stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-29 20:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'special-stage-respects-nextmapoverride' into 'next'

Browse source 
Make Special Stage map transitions respect nextmapoverride.

See merge request STJr/SRB2!1129
This commit is contained in:
Lachlan Wright 2020-09-27 22:42:07 -04:00
commit ca2eb78055
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/g_game.c
View file

@ -3815,7 +3815,7 @@ static void G_DoCompleted(void)
// a map of the proper gametype -- skip levels that don't support // a map of the proper gametype -- skip levels that don't support
// the current gametype. (Helps avoid playing boss levels in Race, // the current gametype. (Helps avoid playing boss levels in Race,
// for instance). // for instance).
if (!spec) if (!spec || nextmapoverride)
{ {
if (nextmap >= 0 && nextmap < NUMMAPS) if (nextmap >= 0 && nextmap < NUMMAPS)
{ {
@ -3867,7 +3867,8 @@ static void G_DoCompleted(void)
if (nextmap < 0 || (nextmap >= NUMMAPS && nextmap < 1100-1) || nextmap > 1103-1) if (nextmap < 0 || (nextmap >= NUMMAPS && nextmap < 1100-1) || nextmap > 1103-1)
I_Error("Followed map %d to invalid map %d\n", prevmap + 1, nextmap + 1); I_Error("Followed map %d to invalid map %d\n", prevmap + 1, nextmap + 1);
lastmap = nextmap; // Remember last map for when you come out of the special stage. if (!spec)
lastmap = nextmap; // Remember last map for when you come out of the special stage.
} }
if ((gottoken = ((gametyperules & GTR_SPECIALSTAGES) && token))) if ((gottoken = ((gametyperules & GTR_SPECIALSTAGES) && token)))
@ -3888,7 +3889,7 @@ static void G_DoCompleted(void)
} }
} }
if (spec && !gottoken) if (spec && !gottoken && !nextmapoverride)
nextmap = lastmap; // Exiting from a special stage? Go back to the game. Tails 08-11-2001 nextmap = lastmap; // Exiting from a special stage? Go back to the game. Tails 08-11-2001
automapactive = false; automapactive = false;