#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() */
+#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
}
if (cleanup_flags & CLEANUP_WIN_INFO)
{
- free(world->wins.info->_title);
+ free_win(world->wins.info);
}
if (cleanup_flags & CLEANUP_WIN_MAP)
{
- free(world->wins.map->_title);
+ free_win(world->wins.map);
}
if (cleanup_flags & CLEANUP_WIN_LOG)
{
- free(world->wins.log->_title);
+ free_win(world->wins.log);
}
if (cleanup_flags & CLEANUP_WIN_KEYS)
{
- free(world->wins.keys->_title);
+ free_win(world->wins.keys);
+ }
+ if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
+ {
+ free_item_defs(world->item_def);
+ free_monster_defs(world->monster_def);
+ }
+ if (cleanup_flags & CLEANUP_MAP_OBJECTS)
+ {
+ free_items(world->item);
+ free_monsters(world->monster);
}
}