X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=0b673af4c2934a2e0457aa91d3c4019d5af60374;hb=c72ed6261224cc0a1b8aa72f6af966715970ff60;hp=d8defc2b4a34a7c5cae5d6896e597566e4698073;hpb=9ea97fca7b7de4de9ed61680de4bb08cd19ff206;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index d8defc2..0b673af 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -5,40 +5,61 @@
 #include <stdio.h> /* for printf(), perror() */
 #include <stdint.h> /* for uint8_t */
 #include <ncurses.h> /* for endwin() */
-#include "main.h" /* for World struct */
+#include <errno.h> /* for errno */
+#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();
     }
 }
 
@@ -51,26 +72,30 @@ 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);
-    perror("errno states");
+    printf("Aborted PlomRogue due to error. %s\nInternal error code: %d\n",
+           msg, err);
+    if (0 != errno)
+    {
+        perror("errno states");
+    }
     exit(EXIT_FAILURE);
 }