Server: Restructure io_loop(), and make obey_msg() handle meta commands.

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index 536c5675bb3e78f7a13af556612031151e778421..5d9091992762878f271637cdf125e62542d5b655 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -97,6 +97,8 @@ static uint8_t try_0args(struct Command * command, char * match, void (* f) ())
     return 0;
 }
 
+
+
 static uint8_t try_1args(struct Command * command, char * match,
                              void (* f) (char), char c)
 {
@@ -110,10 +112,6 @@ static uint8_t try_1args(struct Command * command, char * match,
 
 
 
-/* If "command" fits pattern "keyb_XY" with Y a proper keybinding list ID char
- * and X one of "u" (for "up"), "d" (for "down") or "m" (for "modify"), move up
- * or down or modify entry in the selected keybinding list.
- */
 static uint8_t try_kb_manip(char * command)
 {
     char * cmp = "keyb_";
@@ -148,7 +146,6 @@ static uint8_t try_client_commands(struct Command * command)
             || try_1args(command, "cyc_win_b", cycle_active_win, 'b')
             || try_1args(command, "scrl_r", scroll_v_screen, '+')
             || try_1args(command, "scrl_l", scroll_v_screen, '-')
-            || try_1args(command, "to_a_keywin", toggle_window, 'a')
             || try_1args(command, "to_g_keywin", toggle_window, '0')
             || try_1args(command, "to_wg_keywin", toggle_window, '1')
             || try_1args(command, "to_wk_keywin", toggle_window, '2')
@@ -156,6 +153,7 @@ static uint8_t try_client_commands(struct Command * command)
             || try_1args(command, "to_infowin", toggle_window, 'i')
             || try_1args(command, "to_inv", toggle_window, 'c')
             || try_1args(command, "to_logwin", toggle_window, 'l')
+            || try_1args(command, "to_terrain", toggle_window, 's')
             || try_0args(command, "winconf", toggle_winconfig)
             || try_1args(command, "grow_h", resize_active_win, '*')
             || try_1args(command, "shri_h", resize_active_win, '_')