From: Christian Heller Date: Fri, 17 May 2013 00:24:36 +0000 (+0200) Subject: Moved map scrolling into its own function with its own sanity checks. X-Git-Tag: tce~1291 X-Git-Url: https://plomlompom.com/repos/pick_tasks?a=commitdiff_plain;h=296a2a113e6db94bf38ddb5b74e433799a400315;p=plomrogue Moved map scrolling into its own function with its own sanity checks. --- diff --git a/roguelike.c b/roguelike.c index f4dd621..362826c 100644 --- a/roguelike.c +++ b/roguelike.c @@ -46,6 +46,7 @@ void draw_keys_window (struct Win *); void toggle_window (struct WinMeta *, struct Win *); void init_keybindings(struct World *); struct Map init_map (); +void map_scroll (struct Map *, char); void next_turn (struct World *); void update_log (struct World *, char *); void save_keybindings(struct World *); @@ -249,6 +250,17 @@ struct Map init_map () { map.cells[(y * map.width) + x] = terrain; } return map; } +void map_scroll (struct Map * map, char dir) { +// Scroll map into direction dir if possible by changing the offset. + if ('n' == dir && map->offset_y > 0) + map->offset_y--; + else if ('s' == dir) + map->offset_y++; + else if ('w' == dir && map->offset_x > 0) + map->offset_x--; + else if ('e' == dir) + map->offset_x++; } + void next_turn (struct World * world) { // Increment turn and move enemy. world->turn++; @@ -498,14 +510,14 @@ int main () { keyswin_move_selection (&world, 'd'); else if (key == get_action_key(world.keybindings, "keys mod")) keyswin_mod_key (&world, &win_meta); - else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0) - map.offset_y--; + else if (key == get_action_key(world.keybindings, "map up")) + map_scroll (&map, 'n'); else if (key == get_action_key(world.keybindings, "map down")) - map.offset_y++; + map_scroll (&map, 's'); else if (key == get_action_key(world.keybindings, "map right")) - map.offset_x++; - else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0) - map.offset_x--; + map_scroll (&map, 'e'); + else if (key == get_action_key(world.keybindings, "map left")) + map_scroll (&map, 'w'); else if (key == get_action_key(world.keybindings, "player down")) move_player(&world, 's'); else if (key == get_action_key(world.keybindings, "player up"))