Repaired erroneous previous commit and added check for validity of draw function...

[plomrogue] / src / control.c

diff --git a/src/control.c b/src/control.c
index a2a44b2aaac710ff3b4305abce9a2800f448f1d4..273fddc29481c1a88176ea5433ab510a00cd859e 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -11,9 +11,11 @@
 #include "map.h" /* for map_scroll(), map_center_player(), dir enum */
 #include "main.h" /* for World struct */
 #include "rexit.h" /* for exit_err() */
-#include "misc.h" /* for scroll_pad(), toggle_window(),
-                   * growshrink_active_window()
-                   */
+#include "wincontrol.h" /* for scroll_pad(), toggle_window(),
+                         * growshrink_active_window(), reload_win_config()
+                         * toggle_winconfig(), save_win_configs(),
+                         * toggle_win_height_type(), toggle_win_width_type()
+                         */
 #include "map_object_actions.h" /* for player_wait(), move_player() */
 #include "command_db.h" /* for is_command_id_shortdsc() */
 
@@ -78,11 +80,11 @@ extern uint8_t player_control(int key, struct World * world)
 
 extern uint8_t meta_control(int key, struct World * world)
 {
-    struct WinMeta * win_meta = world->wins.meta;
-    struct Win * win_keys     = world->wins.keys;
-    struct Win * win_map      = world->wins.map;
-    struct Win * win_info     = world->wins.info;
-    struct Win * win_log      = world->wins.log;
+    struct WinMeta * win_meta = world->wmeta;
+    struct Win * win_keys     = get_win_by_id(world, 'k');
+    struct Win * win_map      = get_win_by_id(world, 'm');
+    struct Win * win_info     = get_win_by_id(world, 'i');
+    struct Win * win_log      = get_win_by_id(world, 'l');
     char * err_toggle = "Trouble with toggle_window() in meta_keys().";
     char * err_shift  = "Trouble with shift_active_win() in meta_keys().";
     char * err_resize = "Trouble with growshrink_active_window() in "
@@ -133,19 +135,19 @@ extern uint8_t meta_control(int key, struct World * world)
     }
     else if (key == get_action_key(world->keybindings, "grow_h"))
     {
-        exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
+        exit_err(growshrink_active_window(world, '*'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "shri_h"))
     {
-        exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
+        exit_err(growshrink_active_window(world, '_'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "grow_v"))
     {
-        exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
+        exit_err(growshrink_active_window(world, '+'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "shri_v"))
     {
-        exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
+        exit_err(growshrink_active_window(world, '-'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "save_keys"))
     {
@@ -181,7 +183,27 @@ extern uint8_t meta_control(int key, struct World * world)
     }
     else if (key == get_action_key(world->keybindings, "map_c"))
     {
-        map_center_player (world->map, world->player, win_map->frame.size);
+        map_center_player(world->map, world->player, win_map->frame.size);
+    }
+    else if (key == get_action_key(world->keybindings, "reload_wins"))
+    {
+        reload_win_config(world);
+    }
+    else if (key == get_action_key(world->keybindings, "winconf"))
+    {
+        toggle_winconfig(world, world->wmeta->active);
+    }
+    else if (key == get_action_key(world->keybindings, "to_height_t"))
+    {
+        toggle_win_height_type(world, world->wmeta->active);
+    }
+    else if (key == get_action_key(world->keybindings, "to_width_t"))
+    {
+        toggle_win_width_type(world, world->wmeta->active);
+    }
+    else if (key == get_action_key(world->keybindings, "save_winconf"))
+    {
+        save_win_configs(world);
     }
     return 0;
 }