OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Explicit handler deinitizliation in P_Shutdown and P_FreeLevelData

Browse source
This commit is contained in:
ZZYZX 2017-02-03 13:01:15 +02:00
commit b45af599c5
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/events.cpp
View file

@ -200,15 +200,11 @@ void E_InitStaticHandlers(bool map)
if (savegamerestore)
return;
// just make sure
E_Shutdown(map);
if (map) // don't initialize map handlers if restoring from savegame.
{
// delete old handlers if any.
for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next)
{
if (!handler->IsStatic())
handler->Destroy();
}
// load non-static handlers from gameinfo
for (unsigned int i = 0; i < gameinfo.EventHandlers.Size(); i++)
{
@ -228,13 +224,6 @@ void E_InitStaticHandlers(bool map)
}
else
{
// delete old static handlers if any.
for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next)
{
if (handler->IsStatic())
handler->Destroy();
}
for (unsigned int i = 0; i < gameinfo.EventHandlers.Size(); i++)
{
FString typestring = gameinfo.EventHandlers[i];
@ -246,6 +235,16 @@ void E_InitStaticHandlers(bool map)
}
}
void E_Shutdown(bool map)
{
// delete handlers.
for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next)
{
if (handler->IsStatic() == !map)
handler->Destroy();
}
}
#define DEFINE_EVENT_LOOPER(name) void E_##name() \
{ \
for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next) \