#include "map.h" /* for Map struct */
#include "keybindings.h" /* for KeysWinData, KeyBinding structs */
#include "command_db.h" /* for free_command_db() */
-#include "windows.h" /* for Win struct */
-
+#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() */
/* The clean-up routine and the flag resource by which it decides what to do. */
}
if (cleanup_flags & CLEANUP_KEYBINDINGS)
{
- uint16_t key;
- for (key = 0; key <= world->keyswindata->max; key++)
+/*
+ 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);
}
if (cleanup_flags & CLEANUP_LOG)
{
free_command_db(world);
}
- if (cleanup_flags & CLEANUP_WIN_INFO)
+ if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+ {
+ free_items(world->item);
+ free_monsters(world->monster);
+ }
+ if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
{
- free(world->wins.info->_title);
+ free_item_defs(world->item_def);
+ free_monster_defs(world->monster_def);
}
- if (cleanup_flags & CLEANUP_WIN_MAP)
+ if (cleanup_flags & CLEANUP_WINS)
{
- free(world->wins.map->_title);
+ free_wins(world);
}
- if (cleanup_flags & CLEANUP_WIN_LOG)
+ if (cleanup_flags & CLEANUP_WINCONFS)
{
- free(world->wins.log->_title);
+ free_winconfs(world);
}
- if (cleanup_flags & CLEANUP_WIN_KEYS)
+ if (cleanup_flags & CLEANUP_WIN_META)
{
- free(world->wins.keys->_title);
+ free_winmeta(world->wmeta);
}
}