stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-24 18:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix BootMap not having any effect when loaded from the addon menu

Browse source
This commit is contained in:
Gustaf Alhäll 2024-10-13 14:06:45 +02:00
parent 987d2ee59a
commit 22ce859e65
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deh_soc.c
View file

@ -3549,6 +3549,8 @@ void readmaincfg(MYFILE *f)
char *tmp; char *tmp;
INT32 value; INT32 value;
bootmap = 0; // reset bootmap so we don't warp to the wrong map if another maincfg had set this before
do do
{ {
if (myfgets(s, MAXLINELEN, f)) if (myfgets(s, MAXLINELEN, f))

7
src/dehacked.c
View file

@ -587,7 +587,12 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
if (gamestate == GS_TITLESCREEN) if (gamestate == GS_TITLESCREEN)
{ {
if (introchanged) if (bootmap)
{
menuactive = false;
D_MapChange(bootmap, gametype, ultimatemode, true, 0, false, false);
}
else if (introchanged)
{ {
menuactive = false; menuactive = false;
I_UpdateMouseGrab(); I_UpdateMouseGrab();