X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=5640d89fc6065b5033fdf9431431552ab066e96c;hb=3f85df09f025ef8ab3f655cf5e4517b3be66f0ee;hp=7bd4440ab7d429607788a657c76f13e81916bcfc;hpb=c0a785104a8081e7911647345285da9e9ed22907;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index 7bd4440..5640d89 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -10,7 +10,8 @@
 #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 "windows.h" /* for Win struct, free_win(), free_winmeta() */
+#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
 
 
 
@@ -50,19 +51,33 @@ static void cleanup(struct World * world)
     }
     if (cleanup_flags & CLEANUP_WIN_INFO)
     {
-        free(world->wins.info->_title);
+        free_win(world->wins.info);
     }
     if (cleanup_flags & CLEANUP_WIN_MAP)
     {
-        free(world->wins.map->_title);
+        free_win(world->wins.map);
     }
     if (cleanup_flags & CLEANUP_WIN_LOG)
     {
-        free(world->wins.log->_title);
+        free_win(world->wins.log);
     }
     if (cleanup_flags & CLEANUP_WIN_KEYS)
     {
-        free(world->wins.keys->_title);
+        free_win(world->wins.keys);
+    }
+    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);
     }
 }