X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Frexit.c;h=5fa660ea2175e925855bf6c6323ab18312a9335c;hb=b05b66a27258c581a10e81348088c3486cb8f569;hp=01c572775b611eb1ca5d6e0d5a6b6501131e54ee;hpb=140cadf8f8dc73a1756169dbfa7cb5f05e3b8b8c;p=plomrogue
diff --git a/src/rexit.c b/src/rexit.c
index 01c5727..5fa660e 100644
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -8,11 +8,13 @@
#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_item_defs(), free_monster_defs() */
-#include "wincontrol.h" /* for get_win_by_id(), free_winconfs(), free_wins() */
+#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. */
@@ -27,24 +29,13 @@ 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 i = 0;
- struct KeyBinding * kb_p = world->keybindings;
- while (1)
- {
- free(kb_p);
- free(world->keybindings[key].name);
- }
- free(world->keybindings);
-*/
- free_keybindings(world->keybindings);
- free(world->keyswindata);
+ free_map_object_defs(world->map_obj_defs);
}
if (cleanup_flags & CLEANUP_LOG)
{
@@ -54,23 +45,13 @@ static void cleanup(struct World * world)
{
free_command_db(world);
}
- if (cleanup_flags & CLEANUP_MAP_OBJECTS)
- {
- free_items(world->item);
- free_monsters(world->monster);
- }
- if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
- {
- free_item_defs(world->item_def);
- free_monster_defs(world->monster_def);
- }
- if (cleanup_flags & CLEANUP_WINS)
+ if (cleanup_flags & CLEANUP_MAP)
{
- free_wins(world);
+ free(world->map->cells);
}
- if (cleanup_flags & CLEANUP_WINCONFS)
+ if (cleanup_flags & CLEANUP_INTERFACE_CONF)
{
- free_winconfs(world);
+ unload_interface_conf(world);
}
if (cleanup_flags & CLEANUP_WIN_META)
{