thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-25 19:43:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook

Browse source 
# Conflicts:
#	src/p_setup.c
This commit is contained in:
toaster 2022-03-18 16:56:39 +00:00
parent b0aeb6ce03
commit 5fa9ba1be0
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/p_setup.c
View file

@ -4191,7 +4191,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
P_ResetTubeWaypoints(); P_ResetTubeWaypoints();
P_MapStart(); P_MapStart(); // tmthing can be used starting from this point
// init anything that P_SpawnSlopes/P_LoadThings needs to know // init anything that P_SpawnSlopes/P_LoadThings needs to know
P_InitSpecials(); P_InitSpecials();
@ -4283,8 +4283,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// clear special respawning que // clear special respawning que
iquehead = iquetail = 0; iquehead = iquetail = 0;
P_MapEnd();
// Remove the loading shit from the screen // Remove the loading shit from the screen
if (rendermode != render_none && !titlemapinaction && !reloadinggamestate) if (rendermode != render_none && !titlemapinaction && !reloadinggamestate)
F_WipeColorFill(levelfadecol); F_WipeColorFill(levelfadecol);
@ -4368,8 +4366,11 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
LUAh_MapLoad(); LUAh_MapLoad();
} }
K_TimerReset(); K_TimerReset();
P_MapEnd(); // tmthing is no longer needed from this point onwards
// No render mode or reloading gamestate, stop here. // No render mode or reloading gamestate, stop here.
if (rendermode == render_none || reloadinggamestate) if (rendermode == render_none || reloadinggamestate)
return true; return true;