X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Frexit.c;h=5640d89fc6065b5033fdf9431431552ab066e96c;hb=f44e1046dd5fafc71ac481490633ae544c5e5b0c;hp=204961331c889553bb9b247ef86bbd9d7b675cba;hpb=b705b99b02a5eeb2b76605fe9b11eb6d5411d6e3;p=plomrogue diff --git a/src/rexit.c b/src/rexit.c index 2049613..5640d89 100644 --- a/src/rexit.c +++ b/src/rexit.c @@ -10,8 +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 "wincontrol.h" /* for free_win() */ +#include "windows.h" /* for Win struct, free_win(), free_winmeta() */ +#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */ @@ -65,6 +65,20 @@ static void cleanup(struct World * world) { free_win(world->wins.keys); } + if (cleanup_flags & CLEANUP_WIN_META) + { + free_winmeta(world->wins.meta); + } + 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); + } }