Improved windows cleaning up: free win_meta, ncurses windows/pads.

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 204961331c889553bb9b247ef86bbd9d7b675cba..8b32d4ad760aa3dacb1308c7b9f0938ff553ee38 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -10,8 +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 "wincontrol.h" /* for free_win() */
+#include "windows.h" /* for Win struct, free_win() */
+#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
 
 
 
@@ -65,6 +65,21 @@ static void cleanup(struct World * world)
     {
         free_win(world->wins.keys);
     }
+    if (cleanup_flags & CLEANUP_WIN_META)
+    {
+        delwin(world->wins.meta->padframe.curses_win);
+        free(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);
+    }
 }