Unified (and heavily re-factored) (un-)loading/saving of keybindings and window confi...

[plomrogue] / src / wincontrol.c

diff --git a/src/wincontrol.c b/src/wincontrol.c
index 6682087862af0e1e010b2d1c7fdabfb7e1f95c80..91431814f9fd6629850b3d5696e0e3985aa1b596 100644 (file)
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -18,7 +18,7 @@
 #include "main.h" /* for World struct */
 #include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
                         * draw_win_available_keybindings(),
-                        * draw_win_keybindings_global(),
+                        * draw_win_keybindings_global(), draw_win_inventory(),
                         * draw_win_keybindings_winconf_geometry(),
                         * draw_win_keybindings_winconf_keybindings(),
                         * draw_winconf_geometry(), draw_winconf_keybindings()
@@ -276,6 +276,10 @@ static struct WinConf * get_winconf_by_id(struct World * world, char id)
 
 static void * get_drawfunc_by_char(char c)
 {
+    if      ('c' == c)
+    {
+        return draw_win_inventory;
+    }
     if      ('i' == c)
     {
         return draw_win_info;
@@ -284,14 +288,14 @@ static void * get_drawfunc_by_char(char c)
     {
         return draw_win_log;
     }
-    else if ('m' == c)
-    {
-        return draw_win_map;
-    }
     else if ('k' == c)
     {
         return draw_win_available_keybindings;
     }
+    else if ('m' == c)
+    {
+        return draw_win_map;
+    }
     else if ('0' == c)
     {
         return draw_win_keybindings_global;
@@ -461,20 +465,6 @@ extern void sorted_wintoggle_and_activate(struct World * world)
 
 
 
-extern void reload_win_config(struct World * world)
-{
-    while (0 != world->wmeta->active)
-    {
-        suspend_win(world->wmeta, world->wmeta->active);
-    }
-    free_winconfs(world);
-    init_winconfs(world);
-    init_wins(world);
-    sorted_wintoggle_and_activate(world);
-}
-
-
-
 extern void save_win_configs(struct World * world)
 {
     char * f_name = "save_win_configs()";