Fixed memory handling bug.

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 2907705af45948398966b77b2cf141bea3ef676c..e39a9feaa658fae15e8e9a40568e0b8994546d32 100644 (file)
--- 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, 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,31 +49,27 @@ static void cleanup(struct World * world)
     {
         free_command_db(world);
     }
-    if (cleanup_flags & CLEANUP_WIN_INFO)
-    {
-        free_win(world->wins.info);
-    }
-    if (cleanup_flags & CLEANUP_WIN_MAP)
+    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
     {
-        free_win(world->wins.map);
+        free_items(world->item);
+        free_monsters(world->monster);
     }
-    if (cleanup_flags & CLEANUP_WIN_LOG)
+    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
     {
-        free_win(world->wins.log);
+        free_item_defs(world->item_def);
+        free_monster_defs(world->monster_def);
     }
-    if (cleanup_flags & CLEANUP_WIN_KEYS)
+    if (cleanup_flags & CLEANUP_WINS)
     {
-        free_win(world->wins.keys);
+        free_wins(world);
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
+    if (cleanup_flags & CLEANUP_WINCONFS)
     {
-        free_item_defs(world->item_def);
-        free_monster_defs(world->monster_def);
+        free_winconfs(world);
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+    if (cleanup_flags & CLEANUP_WIN_META)
     {
-        free_items(world->item);
-        free_monsters(world->monster);
+        free_winmeta(world->wmeta);
     }
 }