X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fcontrol.c;h=504b0f52bdbd7cdfa8b5a55f3c263ccdc56dc94c;hb=d1dfbfa5a6f5f05d761238010b4f853088e3a373;hp=c59053923a7d9cf1c60d6e558d8a439cb0f5e468;hpb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;p=plomrogue diff --git a/src/control.c b/src/control.c index c590539..504b0f5 100644 --- a/src/control.c +++ b/src/control.c @@ -8,7 +8,7 @@ #include "keybindings.h" /* for get_keycode_to_action(), mod_selected_keyb(), * move_keyb_mod_selection() */ -#include "map.h" /* for map_scroll(), map_center_object() */ +#include "map.h" /* for map_scroll() */ #include "main.h" /* for World struct */ #include "rexit.h" /* for exit_err() */ #include "wincontrol.h" /* for scroll_pad(), toggle_window(), @@ -306,23 +306,24 @@ extern uint8_t meta_control(int key, struct World * world) } else if (key == get_available_keycode_to_action(world, "map_u")) { - map_scroll(world->map, NORTH, win_map->frame.size); - } + map_scroll(win_map, world->map->size, NORTH); + } else if (key == get_available_keycode_to_action(world, "map_d")) { - map_scroll(world->map, SOUTH, win_map->frame.size); + map_scroll(win_map, world->map->size, SOUTH); } else if (key == get_available_keycode_to_action(world, "map_r")) { - map_scroll(world->map, EAST, win_map->frame.size); + map_scroll(win_map, world->map->size, EAST); } else if (key == get_available_keycode_to_action(world, "map_l")) { - map_scroll(world->map, WEST, win_map->frame.size); + map_scroll(win_map, world->map->size, WEST); } else if (key == get_available_keycode_to_action(world, "map_c")) { - map_center_object(world->map, get_player(world), win_map->frame.size); + struct MapObj * player = get_player(world); + win_map->center = player->pos; } else if (key == get_available_keycode_to_action(world, "inv_u")) {