X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Frexit.c;h=e39a9feaa658fae15e8e9a40568e0b8994546d32;hb=fd4745e5d345fcce8bd9f41c2f5a10482de448be;hp=5640d89fc6065b5033fdf9431431552ab066e96c;hpb=f44e1046dd5fafc71ac481490633ae544c5e5b0c;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index 5640d89..e39a9fe 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -12,7 +12,7 @@
#include "command_db.h" /* for free_command_db() */
#include "windows.h" /* for Win struct, free_win(), free_winmeta() */
#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
-
+#include "wincontrol.h" /* for get_win_by_id(), free_winconfs(), free_wins() */
/* The clean-up routine and the flag resource by which it decides what to do. */
@@ -49,35 +49,27 @@ static void cleanup(struct World * world)
{
free_command_db(world);
}
- if (cleanup_flags & CLEANUP_WIN_INFO)
+ if (cleanup_flags & CLEANUP_MAP_OBJECTS)
{
- free_win(world->wins.info);
+ free_items(world->item);
+ free_monsters(world->monster);
}
- if (cleanup_flags & CLEANUP_WIN_MAP)
+ if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
{
- free_win(world->wins.map);
+ free_item_defs(world->item_def);
+ free_monster_defs(world->monster_def);
}
- if (cleanup_flags & CLEANUP_WIN_LOG)
+ if (cleanup_flags & CLEANUP_WINS)
{
- free_win(world->wins.log);
+ free_wins(world);
}
- if (cleanup_flags & CLEANUP_WIN_KEYS)
+ if (cleanup_flags & CLEANUP_WINCONFS)
{
- free_win(world->wins.keys);
+ free_winconfs(world);
}
if (cleanup_flags & CLEANUP_WIN_META)
{
- free_winmeta(world->wins.meta);
- }
- if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
- {
- free_item_defs(world->item_def);
- free_monster_defs(world->monster_def);
- }
- if (cleanup_flags & CLEANUP_MAP_OBJECTS)
- {
- free_items(world->item);
- free_monsters(world->monster);
+ free_winmeta(world->wmeta);
}
}