X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Frexit.c;h=7bd4440ab7d429607788a657c76f13e81916bcfc;hb=c0a785104a8081e7911647345285da9e9ed22907;hp=ee71809a27cc671660aae218e2d4da8a3e31be7f;hpb=abc2583a1407593900033de8e9f4419e73cf9848;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index ee71809..7bd4440 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -2,17 +2,20 @@
#include "rexit.h"
#include /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
-#include /* for printf() */
+#include /* for printf(), perror() */
#include /* for uint8_t */
#include /* for endwin() */
+#include /* 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 */
/* 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 +44,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(world->wins.info->_title);
+ }
+ if (cleanup_flags & CLEANUP_WIN_MAP)
+ {
+ free(world->wins.map->_title);
+ }
+ if (cleanup_flags & CLEANUP_WIN_LOG)
+ {
+ free(world->wins.log->_title);
+ }
+ if (cleanup_flags & CLEANUP_WIN_KEYS)
+ {
+ free(world->wins.keys->_title);
+ }
}
@@ -69,8 +92,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);
exit(EXIT_FAILURE);
}