Cleaned up memory allocation by Win initialization.

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index cb69ccd842c9275f41067e6704ae523bea9dfa60..204961331c889553bb9b247ef86bbd9d7b675cba 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -5,15 +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 */
+#include "wincontrol.h" /* for free_win() */
 
-#include "errno.h"
 
 
 /* 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);
 
 
@@ -42,6 +45,26 @@ 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);
+    }
 }
 
 
@@ -70,10 +93,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);
-    errno = 0;
-    perror("errno states");
     exit(EXIT_FAILURE);
 }