X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Frexit.c;h=5fa660ea2175e925855bf6c6323ab18312a9335c;hb=2c2521789dc5c8bb77eb36362d4244606f878420;hp=73d740ba4bd8e8d4e55809758dc9b1d000818dea;hpb=9cc02529df358c0cc32ca1b1cde9c327204a5183;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index 73d740b..5fa660e 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -2,17 +2,23 @@
#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 "keybindings.h" /* for free_keybindings() */
+#include "command_db.h" /* for free_command_db() */
+#include "windows.h" /* for Win struct, free_win(), free_winmeta() */
+#include "map_objects.h" /* for free_map_objects, free_map_object_defs() */
+#include "wincontrol.h" /* for free_winconfs() */
+#include "misc.h" /* for unload_interface_conf() */
/* 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);
@@ -23,24 +29,34 @@ static void cleanup(struct World * world)
{
endwin();
}
- if (cleanup_flags & CLEANUP_MAP)
+ if (cleanup_flags & CLEANUP_MAP_OBJECTS)
{
- free(world->map->cells);
+ free_map_objects(world->map_objs);
}
- if (cleanup_flags & CLEANUP_KEYBINDINGS)
+ if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
{
- uint16_t key;
- for (key = 0; key <= world->keyswindata->max; key++)
- {
- free(world->keybindings[key].name);
- }
- free(world->keybindings);
- free(world->keyswindata);
+ free_map_object_defs(world->map_obj_defs);
}
if (cleanup_flags & CLEANUP_LOG)
{
free(world->log);
}
+ if (cleanup_flags & CLEANUP_COMMAND_DB)
+ {
+ free_command_db(world);
+ }
+ if (cleanup_flags & CLEANUP_MAP)
+ {
+ free(world->map->cells);
+ }
+ if (cleanup_flags & CLEANUP_INTERFACE_CONF)
+ {
+ unload_interface_conf(world);
+ }
+ if (cleanup_flags & CLEANUP_WIN_META)
+ {
+ free_winmeta(world->wmeta);
+ }
}
@@ -67,6 +83,15 @@ extern void exit_err(uint8_t err, struct World * world, char * msg)
return;
}
cleanup(world);
- printf("%s\n", 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);
}