X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=f236ecf9a8e808f79476e8d654e7568d4e631a02;hb=bf8ae37ed027803ebbf0d71add8b1aff24a7896d;hp=b73d8015bd65cdb3abb2ef6ea6ec47670110a18a;hpb=a053b626309d3d9c51caecf35a018b6e1df5ecb5;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index b73d801..f236ecf 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -8,7 +8,7 @@
#include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(),
* mod_selected_keyb(), move_keyb_selection()
*/
-#include "map_window.h" /* for map_scroll(), map_center() */
+#include "map.h" /* for map_scroll(), map_center() */
#include "misc.h" /* reload_interface_conf(), save_interface_conf(),
* nav_inventory()
*/
@@ -81,10 +81,10 @@ static uint8_t try_2args(struct Command * command, char * match,
static uint8_t try_client_commands(struct Command * command)
{
return ( try_0args(command, "map_c", map_center)
- || try_1args(command, "map_u", map_scroll, 'N')
- || try_1args(command, "map_d", map_scroll, 'S')
- || try_1args(command, "map_r", map_scroll, 'E')
- || try_1args(command, "map_l", map_scroll, 'W')
+ || try_1args(command, "map_u", map_scroll, '8')
+ || try_1args(command, "map_d", map_scroll, '2')
+ || try_1args(command, "map_r", map_scroll, '6')
+ || try_1args(command, "map_l", map_scroll, '4')
|| try_1args(command, "inv_u", nav_inventory, 'u')
|| try_1args(command, "inv_d", nav_inventory, 'd')
|| try_1args(command, "cyc_win_f", cycle_active_win, 'f')
@@ -149,21 +149,21 @@ static uint8_t try_server_commands(struct Command * command)
extern uint8_t try_key(uint16_t key)
{
- struct Command * command = get_command_to_keycode(world.kb_global.kbs, key);
+ struct Command * command = get_command_to_keycode(&world.kb_global, key);
if (!command && world.winDB.active)
{
struct Win * w = get_win_by_id(world.winDB.active);
if (0 == w->view)
{
- command = get_command_to_keycode(w->kb.kbs, key);
+ command = get_command_to_keycode(&w->kb, key);
}
else if (1 == w->view)
{
- command = get_command_to_keycode(world.kb_wingeom.kbs, key);
+ command = get_command_to_keycode(&world.kb_wingeom, key);
}
else if (2 == w->view)
{
- command = get_command_to_keycode(world.kb_winkeys.kbs, key);
+ command = get_command_to_keycode(&world.kb_winkeys, key);
}
}
if (command)