X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Frexit.c;h=0b673af4c2934a2e0457aa91d3c4019d5af60374;hb=97d23e7656f4c5e634b789fc760183edd7fd581e;hp=31cf3ee724c47b5d0b2184484cae0c180de831a5;hpb=f92f23955f2aec3bf90dce810706f8a6062f6c72;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index 31cf3ee..0b673af 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -6,41 +6,60 @@
#include /* for uint8_t */
#include /* for endwin() */
#include /* for errno */
-#include "main.h" /* for World struct */
+#include "main.h" /* for world global */
#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 "misc.h" /* for unload_interface_conf() */
+#include "map_object_actions.h" /* for free_map_object_actions() */
/* The clean-up routine and the flag resource by which it decides what to do. */
-static uint8_t cleanup_flags = 0x00;
-static void cleanup(struct World * world);
+static uint32_t cleanup_flags = 0x0000;
+static void cleanup();
-static void cleanup(struct World * world)
+static void cleanup()
{
if (cleanup_flags & CLEANUP_NCURSES)
{
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);
+ free(world.log);
+ }
+ if (cleanup_flags & CLEANUP_COMMAND_DB)
+ {
+ free_command_db();
+ }
+ if (cleanup_flags & CLEANUP_MAPOBJACTS)
+ {
+ free_map_object_actions(world.map_obj_acts);
+ }
+ if (cleanup_flags & CLEANUP_MAP)
+ {
+ free(world.map->cells);
+ }
+ if (cleanup_flags & CLEANUP_INTERFACE_CONF)
+ {
+ unload_interface_conf();
+ }
+ if (cleanup_flags & CLEANUP_WIN_META)
+ {
+ free_winmeta();
}
}
@@ -53,26 +72,27 @@ extern void set_cleanup_flag(enum cleanup_flag flag)
-extern void exit_game(struct World * world)
+extern void exit_game()
{
- cleanup(world);
+ cleanup();
exit(EXIT_SUCCESS);
}
-extern void exit_err(uint8_t err, struct World * world, char * msg)
+extern void exit_err(uint8_t err, char * msg)
{
if (0 == err)
{
return;
}
- cleanup(world);
+ cleanup();
if (NULL == msg)
{
msg = "Details unknown.";
}
- printf("Aborted PlomRogue due to error. %s\n", msg);
+ printf("Aborted PlomRogue due to error. %s\nInternal error code: %d\n",
+ msg, err);
if (0 != errno)
{
perror("errno states");