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

My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit

Browse source
This commit is contained in:
Monster Iestyn 2021-05-28 18:56:32 +01:00
parent ada6ec07db
commit 45b1223f3e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_setup.c
View file

@ -4295,6 +4295,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
P_RunCachedActions();
P_MapEnd(); // tmthing is no longer needed from this point onwards
// Took me 3 hours to figure out why my progression kept on getting overwritten with the titlemap...
if (!titlemapinaction)
{
@ -4318,11 +4320,11 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
}
P_PreTicker(2);
P_MapStart(); // just in case MapLoad modifies tmthing
LUAh_MapLoad();
P_MapEnd(); // just in case MapLoad modifies tmthing
}
P_MapEnd(); // tmthing is no longer needed from this point onwards
// No render mode or reloading gamestate, stop here.
if (rendermode == render_none || reloadinggamestate)
return true;