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 d718f19d5656a1c9a0d838c96cd8d6dcc87d6a9d..e35e8a187d150dcad717c87e74825a5ae4b65d1c 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -2,17 +2,21 @@
 
 #include "rexit.h"
 #include <stdlib.h> /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
-#include <stdio.h> /* for printf() */
+#include <stdio.h> /* for printf(), perror() */
 #include <stdint.h> /* for uint8_t */
 #include <ncurses.h> /* for endwin() */
+#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);
 
 
@@ -23,23 +27,41 @@ static void cleanup(struct World * world)
     {
         endwin();
     }
+    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+    {
+        free_items(world->item);
+        free_monsters(world->monster);
+    }
+    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
+    {
+        free_item_defs(world->item_def);
+        free_monster_defs(world->monster_def);
+    }
+    if (cleanup_flags & CLEANUP_LOG)
+    {
+        free(world->log);
+    }
+    if (cleanup_flags & CLEANUP_COMMAND_DB)
+    {
+        free_command_db(world);
+    }
     if (cleanup_flags & CLEANUP_MAP)
     {
         free(world->map->cells);
     }
     if (cleanup_flags & CLEANUP_KEYBINDINGS)
     {
-        uint16_t key;
-        for (key = 0; key <= world->keyswindata->max; key++)
-        {
-            free(world->keybindings[key].name);
-        }
-        free(world->keybindings);
-        free(world->keyswindata);
+        free_keybindings(world->kb_global.kbs);
+        free_keybindings(world->kb_wingeom.kbs);
+        free_keybindings(world->kb_winkeys.kbs);
     }
-    if (cleanup_flags & CLEANUP_LOG)
+    if (cleanup_flags & CLEANUP_WIN_META)
     {
-        free(world->log);
+        free_winmeta(world->wmeta);
+    }
+    if (cleanup_flags & CLEANUP_WINCONFS)
+    {
+        free_winconfs(world);
     }
 }
 
@@ -67,6 +89,15 @@ extern void exit_err(uint8_t err, struct World * world, char * msg)
         return;
     }
     cleanup(world);
-    printf(msg);
+    if (NULL == msg)
+    {
+        msg = "Details unknown.";
+    }
+    printf("Aborted PlomRogue due to error. %s\nInternal error code: %d\n",
+           msg, err);
+    if (0 != errno)
+    {
+        perror("errno states");
+    }
     exit(EXIT_FAILURE);
 }