X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.c;h=691cb6840f575e1caac142e49ce8f7d8e33ad6fa;hb=3edf207d99f9e6e7e4b6beb9939bb9618e4be597;hp=e0d029f124b1d6218c2dde85e8b3167cd371aa12;hpb=c1a7e6cdb13cd7d883424afdf0fe08e9a10fbc28;p=plomrogue

diff --git a/src/rexit.c b/src/rexit.c
index e0d029f..691cb68 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -4,71 +4,57 @@
 #include <stdlib.h> /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
 #include <stdio.h> /* for printf(), perror() */
 #include <stdint.h> /* for uint8_t */
-#include <ncurses.h> /* for endwin() */
 #include <errno.h> /* 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() */
-#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
+#include "windows.h" /* for Win struct, free_winmeta_and_endwin() */
+#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 uint32_t cleanup_flags = 0x0000;
-static void cleanup(struct World * world);
+static void cleanup();
 
 
 
-static void cleanup(struct World * world)
+static void cleanup()
 {
-    if (cleanup_flags & CLEANUP_NCURSES)
+    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
     {
-        endwin();
+        free_map_objects(world.map_objs);
     }
-    if (cleanup_flags & CLEANUP_MAP)
-    {
-        free(world->map->cells);
-    }
-    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(world);
+        free_command_db();
     }
-    if (cleanup_flags & CLEANUP_WIN_INFO)
+    if (cleanup_flags & CLEANUP_MAPOBJACTS)
     {
-        free_win(world->wins.info);
+        free_map_object_actions(world.map_obj_acts);
     }
-    if (cleanup_flags & CLEANUP_WIN_MAP)
-    {
-        free_win(world->wins.map);
-    }
-    if (cleanup_flags & CLEANUP_WIN_LOG)
+    if (cleanup_flags & CLEANUP_MAP)
     {
-        free_win(world->wins.log);
+        free(world.map->cells);
     }
-    if (cleanup_flags & CLEANUP_WIN_KEYS)
+    if (cleanup_flags & CLEANUP_INTERFACE)
     {
-        free_win(world->wins.keys);
+        unload_interface_conf();
     }
-    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
+    if (cleanup_flags & CLEANUP_NCURSES)
     {
-        free_item_defs(world->item_def);
-        free_monster_defs(world->monster_def);
+        free_winmeta_and_endwin();
     }
 }
 
@@ -81,21 +67,21 @@ 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.";