X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Froguelike.c;h=5456e2481ce030a30d12f791b0ada1358d0b21a7;hb=a2d6910578c4beb039d0aacfc3df733228d33837;hp=c3078b285bc7892667b96e346089028f4c34968e;hpb=1191fe6ec56b6fd2155c0c71de15740187739fd9;p=plomrogue

diff --git a/src/roguelike.c b/src/roguelike.c
index c3078b2..5456e24 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -71,12 +71,32 @@ struct Map init_map () {
       map.cells[y * map.size.x + x] = '.'; } }
   return map; }
 
-void map_scroll (struct Map * map, char dir) {
+void map_scroll (struct Map * map, char dir, struct yx_uint16 win_size) {
 // Scroll map into direction dir if possible by changing the offset.
-  if      (NORTH == dir && map->offset.y > 0) map->offset.y--;
-  else if (SOUTH == dir)                      map->offset.y++;
-  else if (WEST  == dir && map->offset.x > 0) map->offset.x--;
-  else if (EAST  == dir)                      map->offset.x++; }
+  if      (NORTH == dir && map->offset.y > 0)
+    map->offset.y--;
+  else if (WEST  == dir && map->offset.x > 0)
+    map->offset.x--;
+  else if (SOUTH == dir && map->offset.y + win_size.y < map->size.y)
+    map->offset.y++;
+  else if (EAST  == dir && map->offset.x + win_size.x < map->size.x)
+    map->offset.x++; }
+
+uint16_t center_offset (uint16_t pos, uint16_t mapsize, uint16_t framesize) {
+// Return the offset for display of a map inside a frame centered on pos.
+  uint16_t offset = 0;
+  if (mapsize > framesize) {
+    if (pos > framesize / 2) {
+      if (pos < mapsize - (framesize / 2))
+        offset = pos - (framesize / 2);
+      else
+        offset = mapsize - framesize; } }
+  return offset; }
+
+void map_center_player (struct Map * map, struct Player * player, struct yx_uint16 frame_size) {
+// Center map on player.
+  map->offset.y = center_offset (player->pos.y, map->size.y, frame_size.y);
+  map->offset.x = center_offset (player->pos.x, map->size.x, frame_size.x); }
 
 void turn_over (struct World * world, char action) {
 // Record action in game record file, increment turn and move enemy.
@@ -167,13 +187,15 @@ unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta
   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_scroll (world->map, NORTH);
+    map_scroll (world->map, NORTH, win_map->frame.size);
   else if (key == get_action_key(world->keybindings, "map down"))
-    map_scroll (world->map, SOUTH);
+    map_scroll (world->map, SOUTH, win_map->frame.size);
   else if (key == get_action_key(world->keybindings, "map right"))
-    map_scroll (world->map, EAST);
+    map_scroll (world->map, EAST, win_map->frame.size);
   else if (key == get_action_key(world->keybindings, "map left"))
-    map_scroll (world->map, WEST);
+    map_scroll (world->map, WEST, win_map->frame.size);
+  else if (key == get_action_key(world->keybindings, "map center player"))
+    map_center_player (world->map, world->player, win_map->frame.size);
   return 0; }
 
 int main (int argc, char *argv[]) {