X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=e35e8a187d150dcad717c87e74825a5ae4b65d1c;hb=1ae2dac3529b3ead75c5bef1d02d958adcbcc581;hp=2497c034014a6e3d6b585b9d6a9b306aa6cc41c8;hpb=58f0067336c9239750009b3f35d18031bec8f7b5;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index 2497c03..e35e8a1 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -8,13 +8,15 @@
 #include <errno.h> /* for errno */
 #include "main.h" /* for World struct */
 #include "map.h" /* for Map struct */
-#include "keybindings.h" /* for KeysWinData, KeyBinding structs */
+#include "keybindings.h" /* for free_keybindings() */
 #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 free_winconfs() */
 
 
 /* The clean-up routine and the flag resource by which it decides what to do. */
-static uint8_t cleanup_flags = 0x00;
+static uint32_t cleanup_flags = 0x0000;
 static void cleanup(struct World * world);
 
 
@@ -25,19 +27,15 @@ static void cleanup(struct World * world)
     {
         endwin();
     }
-    if (cleanup_flags & CLEANUP_MAP)
+    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
     {
-        free(world->map->cells);
+        free_items(world->item);
+        free_monsters(world->monster);
     }
-    if (cleanup_flags & CLEANUP_KEYBINDINGS)
+    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
     {
-        uint16_t key;
-        for (key = 0; key <= world->keyswindata->max; key++)
-        {
-            free(world->keybindings[key].name);
-        }
-        free(world->keybindings);
-        free(world->keyswindata);
+        free_item_defs(world->item_def);
+        free_monster_defs(world->monster_def);
     }
     if (cleanup_flags & CLEANUP_LOG)
     {
@@ -47,6 +45,24 @@ static void cleanup(struct World * world)
     {
         free_command_db(world);
     }
+    if (cleanup_flags & CLEANUP_MAP)
+    {
+        free(world->map->cells);
+    }
+    if (cleanup_flags & CLEANUP_KEYBINDINGS)
+    {
+        free_keybindings(world->kb_global.kbs);
+        free_keybindings(world->kb_wingeom.kbs);
+        free_keybindings(world->kb_winkeys.kbs);
+    }
+    if (cleanup_flags & CLEANUP_WIN_META)
+    {
+        free_winmeta(world->wmeta);
+    }
+    if (cleanup_flags & CLEANUP_WINCONFS)
+    {
+        free_winconfs(world);
+    }
 }