X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Frexit.c;h=e39a9feaa658fae15e8e9a40568e0b8994546d32;hb=fd4745e5d345fcce8bd9f41c2f5a10482de448be;hp=204961331c889553bb9b247ef86bbd9d7b675cba;hpb=b705b99b02a5eeb2b76605fe9b11eb6d5411d6e3;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index 2049613..e39a9fe 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -10,9 +10,9 @@
#include "map.h" /* for Map struct */
#include "keybindings.h" /* for KeysWinData, KeyBinding structs */
#include "command_db.h" /* for free_command_db() */
-#include "windows.h" /* for Win struct */
-#include "wincontrol.h" /* for free_win() */
-
+#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,21 +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_items(world->item);
+ free_monsters(world->monster);
+ }
+ if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
{
- free_win(world->wins.info);
+ free_item_defs(world->item_def);
+ free_monster_defs(world->monster_def);
}
- if (cleanup_flags & CLEANUP_WIN_MAP)
+ if (cleanup_flags & CLEANUP_WINS)
{
- free_win(world->wins.map);
+ free_wins(world);
}
- if (cleanup_flags & CLEANUP_WIN_LOG)
+ if (cleanup_flags & CLEANUP_WINCONFS)
{
- free_win(world->wins.log);
+ free_winconfs(world);
}
- if (cleanup_flags & CLEANUP_WIN_KEYS)
+ if (cleanup_flags & CLEANUP_WIN_META)
{
- free_win(world->wins.keys);
+ free_winmeta(world->wmeta);
}
}