Strongly overhauled keybinding managemment. Window-specific keybindings and a window...

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 01c572775b611eb1ca5d6e0d5a6b6501131e54ee..e35e8a187d150dcad717c87e74825a5ae4b65d1c 100644 (file)
--- 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 get_win_by_id(), free_winconfs(), free_wins() */
+#include "wincontrol.h" /* for free_winconfs() */
 
 
 /* The clean-up routine and the flag resource by which it decides what to do. */
@@ -27,24 +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 i = 0;
-        struct KeyBinding * kb_p = world->keybindings;
-        while (1)
-        {
-            free(kb_p);
-            free(world->keybindings[key].name);
-        }
-        free(world->keybindings);
-*/
-        free_keybindings(world->keybindings);
-        free(world->keyswindata);
+        free_item_defs(world->item_def);
+        free_monster_defs(world->monster_def);
     }
     if (cleanup_flags & CLEANUP_LOG)
     {
@@ -54,28 +45,24 @@ static void cleanup(struct World * world)
     {
         free_command_db(world);
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+    if (cleanup_flags & CLEANUP_MAP)
     {
-        free_items(world->item);
-        free_monsters(world->monster);
+        free(world->map->cells);
     }
-    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_WINS)
+    if (cleanup_flags & CLEANUP_WIN_META)
     {
-        free_wins(world);
+        free_winmeta(world->wmeta);
     }
     if (cleanup_flags & CLEANUP_WINCONFS)
     {
         free_winconfs(world);
     }
-    if (cleanup_flags & CLEANUP_WIN_META)
-    {
-        free_winmeta(world->wmeta);
-    }
 }