X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Frexit.c;h=e39a9feaa658fae15e8e9a40568e0b8994546d32;hb=2f0b15e05b0df7e10a2d0bb04ce4648455d980a8;hp=b9da482f650d07597b4d2e6a92f81be7c19fed1b;hpb=4d9b6ac142740aa337fc3e622902c9595c36f6d0;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index b9da482..e39a9fe 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -2,16 +2,21 @@
#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, 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 unsigned char cleanup_flags = 0x00;
+static uint32_t cleanup_flags = 0x0000;
static void cleanup(struct World * world);
@@ -40,6 +45,32 @@ static void cleanup(struct World * world)
{
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);
+ }
}
@@ -59,13 +90,22 @@ extern void exit_game(struct World * world)
-extern void exit_err(unsigned char err, struct World * world, char * msg)
+extern void exit_err(uint8_t err, struct World * world, char * msg)
{
if (0 == err)
{
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);
}