X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Frexit.c;h=5640d89fc6065b5033fdf9431431552ab066e96c;hb=e505542d10413b5cf94edda90bdc793a48db9385;hp=f7bb3f23e8553132a8ad2a84c72be0448cb61b31;hpb=7bebc9943d1648d56968146b17c9459affb183c6;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index f7bb3f2..5640d89 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() */
/* 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,40 @@ 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)
+ {
+ free_winmeta(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);
+ }
}
@@ -59,9 +98,22 @@ extern void exit_game(struct World * world)
-extern void exit_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);
}