X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmap.c;h=368c0e2c0ac6d8d8fe08f7c9e08ddd7ec0f10a78;hb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;hp=44a0057f4c8bb799d2f5caab856fa7d33feef377;hpb=83d75731b23c1e7acda3d9d72bcf22fef49315be;p=plomrogue

diff --git a/src/map.c b/src/map.c
index 44a0057..368c0e2 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,21 +1,23 @@
 #include "map.h"
-#include <stdlib.h>      /* for malloc() */
 #include <stdint.h>      /* for uint16_t, uint32_t */
-#include "misc.h"        /* for rrand() and center_offset() */
+#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() */
+struct World;
 
 
 
-struct Map init_map ()
+struct Map init_map(struct World * world)
 {
+    char * f_name = "init_map()";
     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);
+    map.cells = try_malloc(size, world, f_name);
     uint16_t y, x;
     for (y = 0; y < map.size.y; y++)
     {
@@ -28,8 +30,8 @@ struct Map init_map ()
     uint32_t curpos;
     while (1)
     {
-        y = rrand(0, 0) % map.size.y;
-        x = rrand(0, 0) % map.size.x;
+        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])
@@ -75,9 +77,9 @@ void map_scroll (struct Map * map, enum dir d, struct yx_uint16 win_size)
 
 
 
-void map_center_player(struct Map * map, struct Player * player,
+void map_center_object(struct Map * map, struct MapObj * object,
                        struct yx_uint16 win_size)
 {
-    map->offset.y = center_offset (player->pos.y, map->size.y, win_size.y);
-    map->offset.x = center_offset (player->pos.x, map->size.x, win_size.x);
+    map->offset.y = center_offset(object->pos.y, map->size.y, win_size.y);
+    map->offset.x = center_offset(object->pos.x, map->size.x, win_size.x);
 }