X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=e35e8a187d150dcad717c87e74825a5ae4b65d1c;hb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;hp=5640d89fc6065b5033fdf9431431552ab066e96c;hpb=f44e1046dd5fafc71ac481490633ae544c5e5b0c;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index 5640d89..e35e8a1 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -8,11 +8,11 @@
 #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. */
@@ -27,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)
     {
@@ -49,35 +45,23 @@ 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)
-    {
-        free_win(world->wins.map);
-    }
-    if (cleanup_flags & CLEANUP_WIN_LOG)
+    if (cleanup_flags & CLEANUP_MAP)
     {
-        free_win(world->wins.log);
+        free(world->map->cells);
     }
-    if (cleanup_flags & CLEANUP_WIN_KEYS)
+    if (cleanup_flags & CLEANUP_KEYBINDINGS)
     {
-        free_win(world->wins.keys);
+        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->wins.meta);
-    }
-    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
-    {
-        free_item_defs(world->item_def);
-        free_monster_defs(world->monster_def);
+        free_winmeta(world->wmeta);
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+    if (cleanup_flags & CLEANUP_WINCONFS)
     {
-        free_items(world->item);
-        free_monsters(world->monster);
+        free_winconfs(world);
     }
 }