OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Static NewGame events now fire before loading a map, and normal NewGame events fire after registering per-map handlers and before all other events.

Browse source 
- Static event handlers now unregister after per-map handlers.
- All event handlers now unregister in reverse order.
This commit is contained in:
player701 2018-10-31 10:15:56 +03:00 • committed by Christoph Oelckers
commit 04ae32f6f9
7 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/events.cpp
View file

@ -301,7 +301,7 @@ void E_InitStaticHandlers(bool map)
void E_Shutdown(bool map)
{
// delete handlers.
for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next)
for (DStaticEventHandler* handler = E_LastEventHandler; handler; handler = handler->prev)
{
if (handler->IsStatic() == !map)
handler->Destroy();
@ -515,11 +515,16 @@ bool E_CheckReplacement( PClassActor *replacee, PClassActor **replacement )
return final;
}
void E_NewGame()
void E_NewGame(bool map)
{
// Shut down all per-map event handlers before static NewGame events.
if (!map)
E_Shutdown(true);
for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next)
{
handler->NewGame();
if (handler->IsStatic() == !map)
handler->NewGame();
}
}