Unified (and heavily re-factored) (un-)loading/saving of keybindings and window confi...

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 8b32d4ad760aa3dacb1308c7b9f0938ff553ee38..1bc639f3a64ca147c6025f4943dddfb6d073a625 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -8,10 +8,12 @@
 #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() */
+#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() */
+#include "misc.h" /* for unload_interface_conf() */
 
 
 
@@ -27,19 +29,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,37 +47,30 @@ 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_INTERFACE_CONF)
     {
-        free_win(world->wins.keys);
+        unload_interface_conf(world);
     }
     if (cleanup_flags & CLEANUP_WIN_META)
     {
-        delwin(world->wins.meta->padframe.curses_win);
-        free(world->wins.meta);
+        free_winmeta(world->wmeta);
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
+/*
+    if (cleanup_flags & CLEANUP_KEYBINDINGS)
     {
-        free_item_defs(world->item_def);
-        free_monster_defs(world->monster_def);
+        free_keybindings(world->kb_global.kbs);
+        free_keybindings(world->kb_wingeom.kbs);
+        free_keybindings(world->kb_winkeys.kbs);
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+    if (cleanup_flags & CLEANUP_WINCONFS)
     {
-        free_items(world->item);
-        free_monsters(world->monster);
+        free_winconfs(world);
     }
+*/
 }