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

Merge branch 'defer-map-load-scripts' into 'master'

Browse source 
Move level load scripting to P_PostLoadLevel

See merge request KartKrew/Kart!1181
This commit is contained in:
Sal 2023-04-21 01:12:56 +00:00
commit 5085bdfdd8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_setup.c
View file

@ -8084,13 +8084,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
{ {
marathonmode |= MA_INIT; marathonmode |= MA_INIT;
} }
P_MapStart(); // just in case MapLoad modifies tm.thing
ACS_RunLevelStartScripts();
LUA_HookInt(gamemap, HOOK(MapLoad));
P_MapEnd(); // just in case MapLoad modifies tm.thing
} }
else else
{ {
@ -8128,6 +8121,13 @@ void P_PostLoadLevel(void)
marathonmode &= ~MA_INIT; marathonmode &= ~MA_INIT;
} }
P_MapStart(); // just in case MapLoad modifies tm.thing
ACS_RunLevelStartScripts();
LUA_HookInt(gamemap, HOOK(MapLoad));
P_MapEnd(); // just in case MapLoad modifies tm.thing
// We're now done loading the level. // We're now done loading the level.
levelloading = false; levelloading = false;
} }