Some refactoring in map_object_actions library.

[plomrogue] / src / control.c

diff --git a/src/control.c b/src/control.c
index ba1b5055ecba2d6540ac3be1cae19a680cc08046..26b0e2d575ebb82f4402d14d2ffcd7fdebd7958c 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -13,7 +13,7 @@
 #include "main.h" /* for world global */
 #include "wincontrol.h" /* for struct WinConf, scroll_pad(), toggle_window(),
                          * growshrink_active_window(),toggle_winconfig(),
-                         * toggle_win_height_type(), toggle_win_width_type()
+                         * toggle_size_type()
                          */
 #include "map_object_actions.h" /* for struct MapObjAct, actor_wait(),
                                  * actor_move(), actor_drop(), actor_pick(),
@@ -188,9 +188,9 @@ extern uint8_t player_control_by_key(int key)
 extern uint8_t player_control_by_id(int action)
 {
     if (   try_player_cmd(action, "wait", "wait", 0)
-        || try_player_cmd(action, "drop", "drop", world.inventory_select)
+        || try_player_cmd(action, "drop", "drop", world.inventory_sel)
         || try_player_cmd(action, "pick", "pick_up", 0)
-        || try_player_cmd(action, "use", "use", world.inventory_select)
+        || try_player_cmd(action, "use", "use", world.inventory_sel)
         || try_player_cmd(action, "player_u", "move", 'N')
         || try_player_cmd(action, "player_d", "move", 'S')
         || try_player_cmd(action, "player_r", "move", 'E')
@@ -205,8 +205,8 @@ extern uint8_t player_control_by_id(int action)
 
 extern uint8_t wingeom_control(int key)
 {
-    if (   try_cmd_0args(key, "to_height_t", toggle_win_height_type)
-        || try_cmd_0args(key, "to_width_t", toggle_win_width_type)
+    if (   try_cmd_1args(key, "to_height_t", toggle_win_size_type, 'y')
+        || try_cmd_1args(key, "to_width_t", toggle_win_size_type, 'x')
         || try_cmd_1args(key, "grow_h", growshrink_active_window, '*')
         || try_cmd_1args(key, "shri_h", growshrink_active_window, '_')
         || try_cmd_1args(key, "grow_v", growshrink_active_window, '+')