Fixed bug that led to endless loop in nearest_enemy_dir().

[plomrogue] / src / map.c

diff --git a/src/map.c b/src/map.c
index 2db0b9b4d99dafd7c3750308edca7e0484e19e97..3b3f34e9f60b42e79ad882748cc0389eeb0b705a 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -1,51 +1,103 @@
 #include "map.h"
-#include <stdlib.h>
-#include <stdint.h>
-#include "misc.h"
-#include "map_objects.h"
-
-struct Map init_map () {
-// Initialize map with some experimental start values.
-  struct Map map;
-  map.size.x = 64;
-  map.size.y = 64;
-  map.offset.x = 0;
-  map.offset.y = 0;
-  uint32_t size = map.size.x * map.size.y;
-  map.cells = malloc(size);
-  uint16_t y, x;
-  for (y = 0; y < map.size.y; y++)
-    for (x = 0; x < map.size.x; x++)
-      map.cells[(y * map.size.x) + x] = '~';
-  map.cells[size / 2 + (map.size.x / 2)] = '.';
-  uint32_t curpos;
-  while (1) {
-    y = rrand(0, 0) % map.size.y;
-    x = rrand(0, 0) % map.size.x;
-    curpos = y * map.size.x + x;
-    if ('~' == map.cells[curpos] &&
-        (   (curpos >= map.size.x && '.' == map.cells[curpos - map.size.x])
-         || (curpos < map.size.x * (map.size.y-1) && '.' == map.cells[curpos + map.size.x])
-         || (curpos > 0 && curpos % map.size.x != 0 && '.' == map.cells[curpos-1])
-         || (curpos < (map.size.x * map.size.y) && (curpos+1) % map.size.x != 0 && '.' == map.cells[curpos+1]))) {
-      if (y == 0 || y == map.size.y - 1 || x == 0 || x == map.size.x - 1)
-        break;
-      map.cells[y * map.size.x + x] = '.'; } }
-  return map; }
-
-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 (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++; }
-
-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); }
+#include <stdint.h>      /* for uint8_t, uint16_t, uint32_t */
+#include "misc.h"        /* for try_malloc(), center_offset(), rrand() */
+#include "map_objects.h" /* for get_player() */
+#include "yx_uint16.h"   /* for yx_uint16, dir enums */
+#include "windows.h"     /* for struct Win */
+#include "main.h"        /* for world global */
+#include "wincontrol.h"  /* for get_win_by_id() */
 
+
+
+extern struct Map init_map()
+{
+    char * f_name = "init_map()";
+    struct Map map;
+    map.size.x = 64;
+    map.size.y = 64;
+    uint32_t size = map.size.x * map.size.y;
+    map.cells = try_malloc(size, f_name);
+    uint16_t y, x;
+    for (y = 0; y < map.size.y; y++)
+    {
+        for (x = 0; x < map.size.x; map.cells[(y * map.size.x) + x] = '~', x++);
+    }
+    map.cells[size / 2 + (map.size.x / 2)] = '.';
+    uint32_t curpos;
+    while (1)
+    {
+        y = rrand() % map.size.y;
+        x = rrand() % map.size.x;
+        curpos = y * map.size.x + x;
+        if ('~' == map.cells[curpos]
+            && ((curpos >= map.size.x && '.' == map.cells[curpos - map.size.x])
+                || (curpos < map.size.x * (map.size.y-1)
+                     && '.' == map.cells[curpos + map.size.x])
+                || (curpos > 0 && curpos % map.size.x != 0
+                    && '.' == map.cells[curpos-1])
+                || (curpos < (map.size.x * map.size.y)
+                    && (curpos+1) % map.size.x != 0
+                    && '.' == map.cells[curpos+1])))
+        {
+            if (y == 0 || y == map.size.y - 1 || x == 0 || x == map.size.x - 1)
+            {
+                break;
+            }
+            map.cells[y * map.size.x + x] = '.';
+        }
+    }
+    return map;
+}
+
+
+
+extern void map_scroll(char d)
+{
+    struct Win * win = get_win_by_id('m');
+    uint16_t offset;
+    if (('N' == d || 'S' == d) && world.map->size.y > win->framesize.y)
+    {
+        offset = center_offset(win->center.y,
+                               world.map->size.y, win->framesize.y);
+        win->center.y = offset + (win->framesize.y / 2);
+        if ('S' == d && win->center.y < world.map->size.y - 1)
+        {
+            win->center.y++;
+            return;
+        }
+        win->center.y = win->center.y - ('N' == d && win->center.y > 0);
+    }
+    else if (('W' == d || 'E' == d) && world.map->size.x > win->framesize.x)
+    {
+        offset = center_offset(win->center.x,
+                               world.map->size.x, win->framesize.x);
+        win->center.x = offset + (win->framesize.x / 2);
+        if ('E' == d && win->center.x < world.map->size.x - 1)
+        {
+            win->center.x++;
+            return;
+        }
+        win->center.x = win->center.x - ('W' == d && win->center.x > 0);
+    }
+}
+
+
+
+extern void map_center()
+{
+    struct MapObj * player = get_player();
+    struct Win * win_map   = get_win_by_id('m');
+    win_map->center = player->pos;
+}
+
+
+
+extern uint8_t is_passable(struct Map * map, struct yx_uint16 pos)
+{
+    uint8_t passable = 0;
+    if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
+    {
+        passable = (('.' == map->cells[pos.y * map->size.x + pos.x]));
+    }
+    return passable;
+}