Made keybindings array into linked list; on the way rewrote / improved great parts...

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 204961331c889553bb9b247ef86bbd9d7b675cba..01c572775b611eb1ca5d6e0d5a6b6501131e54ee 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -10,9 +10,9 @@
 #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() */
+#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. */
@@ -33,12 +33,17 @@ static void cleanup(struct World * world)
     }
     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)
@@ -49,21 +54,27 @@ static void cleanup(struct World * world)
     {
         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_win(world->wins.info);
+        free_item_defs(world->item_def);
+        free_monster_defs(world->monster_def);
     }
-    if (cleanup_flags & CLEANUP_WIN_MAP)
+    if (cleanup_flags & CLEANUP_WINS)
     {
-        free_win(world->wins.map);
+        free_wins(world);
     }
-    if (cleanup_flags & CLEANUP_WIN_LOG)
+    if (cleanup_flags & CLEANUP_WINCONFS)
     {
-        free_win(world->wins.log);
+        free_winconfs(world);
     }
-    if (cleanup_flags & CLEANUP_WIN_KEYS)
+    if (cleanup_flags & CLEANUP_WIN_META)
     {
-        free_win(world->wins.keys);
+        free_winmeta(world->wmeta);
     }
 }