Merge branch 'allow-lua-to-override-special-stages' into 'next'

Allows Lua to transport you to a different map in place of a Special Stage.

See merge request STJr/SRB2!1368
This commit is contained in:
sphere 2021-06-02 11:16:15 -04:00
commit 2df75610e6

View file

@ -3928,12 +3928,13 @@ static void G_DoCompleted(void)
{
token--;
for (i = 0; i < 7; i++)
if (!(emeralds & (1<<i)))
{
nextmap = ((netgame || multiplayer) ? smpstage_start : sstage_start) + i - 1; // to special stage!
break;
}
if (!nextmapoverride)
for (i = 0; i < 7; i++)
if (!(emeralds & (1<<i)))
{
nextmap = ((netgame || multiplayer) ? smpstage_start : sstage_start) + i - 1; // to special stage!
break;
}
if (i == 7)
{