X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=01c572775b611eb1ca5d6e0d5a6b6501131e54ee;hb=140cadf8f8dc73a1756169dbfa7cb5f05e3b8b8c;hp=802de341f44c98e09e61c6eab8510a2830b51eb4;hpb=a114fa4f1f357895cf540972f20319b7a49c5984;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index 802de34..01c5727 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -5,13 +5,18 @@
 #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 "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() */
 
 
 /* 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);
 
 
@@ -28,18 +33,49 @@ static void cleanup(struct World * world)
     }
     if (cleanup_flags & CLEANUP_KEYBINDINGS)
     {
-        uint16_t key;
-        for (key = 0; key <= world->keyswindata->max; key++)
+/*
+        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);
     }
     if (cleanup_flags & CLEANUP_LOG)
     {
         free(world->log);
     }
+    if (cleanup_flags & CLEANUP_COMMAND_DB)
+    {
+        free_command_db(world);
+    }
+    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_WINS)
+    {
+        free_wins(world);
+    }
+    if (cleanup_flags & CLEANUP_WINCONFS)
+    {
+        free_winconfs(world);
+    }
+    if (cleanup_flags & CLEANUP_WIN_META)
+    {
+        free_winmeta(world->wmeta);
+    }
 }
 
 
@@ -68,9 +104,13 @@ extern void exit_err(uint8_t err, struct World * world, char * msg)
     cleanup(world);
     if (NULL == msg)
     {
-        msg = "Some error encountered. Aborted.";
+        msg = "Details unknown.";
+    }
+    printf("Aborted PlomRogue due to error. %s\nInternal error code: %d\n",
+           msg, err);
+    if (0 != errno)
+    {
+        perror("errno states");
     }
-    printf("%s\n", msg);
-    perror("errno states");
     exit(EXIT_FAILURE);
 }