X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=8b32d4ad760aa3dacb1308c7b9f0938ff553ee38;hb=e6a78faa3052eff39bcadcaf81e2e3b5249071a7;hp=d718f19d5656a1c9a0d838c96cd8d6dcc87d6a9d;hpb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index d718f19..8b32d4a 100644
--- 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 "command_db.h" /* for free_command_db() */
+#include "windows.h" /* for Win struct, free_win() */
+#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
 
 
 
 /* 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);
 
 
@@ -41,6 +45,41 @@ static void cleanup(struct World * world)
     {
         free(world->log);
     }
+    if (cleanup_flags & CLEANUP_COMMAND_DB)
+    {
+        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)
+    {
+        free_win(world->wins.log);
+    }
+    if (cleanup_flags & CLEANUP_WIN_KEYS)
+    {
+        free_win(world->wins.keys);
+    }
+    if (cleanup_flags & CLEANUP_WIN_META)
+    {
+        delwin(world->wins.meta->padframe.curses_win);
+        free(world->wins.meta);
+    }
+    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
+    {
+        free_item_defs(world->item_def);
+        free_monster_defs(world->monster_def);
+    }
+    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+    {
+        free_items(world->item);
+        free_monsters(world->monster);
+    }
 }
 
 
@@ -67,6 +106,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);
 }