X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Frexit.c;h=6f14663cb8bbac5caac205177430c1b8ff20a11e;hb=7290dec4219eaa2325aa00ef6139f715743dba3a;hp=2497c034014a6e3d6b585b9d6a9b306aa6cc41c8;hpb=58f0067336c9239750009b3f35d18031bec8f7b5;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index 2497c03..6f14663 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -6,46 +6,55 @@
#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() */
/* 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(world);
+ free_command_db();
+ }
+ 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);
}
}
@@ -58,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.";