X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=bc21ab5a0dfb5b6c23bbc51fac3b514f777b5e81;hb=336d57bf85ed4b64307dea367c696ec9b477504a;hp=4bd6c7ee15cdd51dd353ba8bfa424650a2161e59;hpb=969ba2899d6abd9d06a187098a5cd015d1aac1e0;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 4bd6c7e..bc21ab5 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++;
@@ -463,9 +475,9 @@ int main () {
     if      (key == get_action_key(world.keybindings, "quit"))
       break;
     else if (key == get_action_key(world.keybindings, "scroll pad right"))
-      win_meta.pad_offset++;
-    else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0)
-      win_meta.pad_offset--;
+      scroll_pad (&win_meta, '+');
+    else if (key == get_action_key(world.keybindings, "scroll pad left"))
+      scroll_pad (&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "toggle keys window"))
       toggle_window(&win_meta, &win_keys);
     else if (key == get_action_key(world.keybindings, "toggle map window"))
@@ -478,17 +490,17 @@ int main () {
       cycle_active_window(&win_meta, 'n');
     else if (key == get_action_key(world.keybindings, "cycle backwards"))
       cycle_active_window(&win_meta, 'p');
-    else if (key == get_action_key(world.keybindings, "shift forwards")  && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "shift forwards"))
       shift_window(&win_meta, 'f');
-    else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "shift backwards"))
       shift_window(&win_meta, 'b');
-    else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "grow horizontally"))
       resize_window(&win_meta, '*');
-    else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "shrink horizontally"))
       resize_window(&win_meta, '_');
-    else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "grow vertically"))
       resize_window(&win_meta, '+');
-    else if (key == get_action_key(world.keybindings, "shrink vertically") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "shrink vertically"))
       resize_window(&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "save keys"))
       save_keybindings(&world);
@@ -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"))