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 16b2782bd3bff63d941bb03e2cc159eb9e4663a9..3b3f34e9f60b42e79ad882748cc0389eeb0b705a 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -1,29 +1,26 @@
 #include "map.h"
-#include <stdint.h>      /* for uint16_t, uint32_t */
-#include "misc.h"        /* for try_malloc(), center_offset() */
-#include "map_objects.h" /* for Player struct */
-#include "yx_uint16.h"   /* for yx_uint16 and dir enums */
-#include "rrand.h"       /* for rrand() */
+#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 */
-struct World;
+#include "main.h"        /* for world global */
+#include "wincontrol.h"  /* for get_win_by_id() */
 
 
 
-struct Map init_map(struct World * world)
+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, world, f_name);
+    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; x++)
-        {
-            map.cells[(y * map.size.x) + x] = '~';
-        }
+        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;
@@ -54,33 +51,53 @@ struct Map init_map(struct World * world)
 
 
 
-void map_scroll(struct Win * win, struct yx_uint16 map_size, enum dir d)
+extern void map_scroll(char d)
 {
+    struct Win * win = get_win_by_id('m');
     uint16_t offset;
-    if ((NORTH == d || SOUTH == d) && map_size.y > win->frame.size.y)
+    if (('N' == d || 'S' == d) && world.map->size.y > win->framesize.y)
     {
-        offset = center_offset(win->center.y, map_size.y, win->frame.size.y);
-        win->center.y = offset + (win->frame.size.y / 2);
-        if      (NORTH == d && win->center.y > 0)
-        {
-            win->center.y--;
-        }
-        else if (SOUTH == d && win->center.y < map_size.y - 1)
+        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 ((WEST == d || EAST == d) && map_size.x > win->frame.size.x)
+    else if (('W' == d || 'E' == d) && world.map->size.x > win->framesize.x)
     {
-        offset = center_offset(win->center.x, map_size.x, win->frame.size.x);
-        win->center.x = offset + (win->frame.size.x / 2);
-        if      (WEST == d && win->center.x > 0)
-        {
-            win->center.x--;
-        }
-        else if (EAST == d && win->center.x < map_size.x - 1)
+        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;
 }