X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/add_free?a=blobdiff_plain;f=src%2Frexit.c;h=e0d029f124b1d6218c2dde85e8b3167cd371aa12;hb=c1a7e6cdb13cd7d883424afdf0fe08e9a10fbc28;hp=7bd4440ab7d429607788a657c76f13e81916bcfc;hpb=c0a785104a8081e7911647345285da9e9ed22907;p=plomrogue diff --git a/src/rexit.c b/src/rexit.c index 7bd4440..e0d029f 100644 --- a/src/rexit.c +++ b/src/rexit.c @@ -10,7 +10,8 @@ #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() */ @@ -50,19 +51,24 @@ static void cleanup(struct World * world) } 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); } }