X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fmap.c;h=92d1558bae9bbdd8d727cd914e51f15f8c0c507c;hb=d1dfbfa5a6f5f05d761238010b4f853088e3a373;hp=44a0057f4c8bb799d2f5caab856fa7d33feef377;hpb=83d75731b23c1e7acda3d9d72bcf22fef49315be;p=plomrogue
diff --git a/src/map.c b/src/map.c
index 44a0057..92d1558 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,21 +1,22 @@
#include "map.h"
-#include /* for malloc() */
#include /* 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() */
+#include "windows.h" /* for struct Win */
+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 +29,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])
@@ -53,31 +54,33 @@ struct Map init_map ()
-void map_scroll (struct Map * map, enum dir d, struct yx_uint16 win_size)
+void map_scroll(struct Win * win, struct yx_uint16 map_size, enum dir d)
{
- if (NORTH == d && map->offset.y > 0)
+ uint16_t offset;
+ if ((NORTH == d || SOUTH == d) && map_size.y > win->framesize.y)
{
- map->offset.y--;
- }
- else if (WEST == d && map->offset.x > 0)
- {
- map->offset.x--;
- }
- else if (SOUTH == d && map->offset.y + win_size.y < map->size.y)
- {
- map->offset.y++;
+ offset = center_offset(win->center.y, map_size.y, win->framesize.y);
+ win->center.y = offset + (win->framesize.y / 2);
+ if (NORTH == d && win->center.y > 0)
+ {
+ win->center.y--;
+ }
+ else if (SOUTH == d && win->center.y < map_size.y - 1)
+ {
+ win->center.y++;
+ }
}
- else if (EAST == d && map->offset.x + win_size.x < map->size.x)
+ else if ((WEST == d || EAST == d) && map_size.x > win->framesize.x)
{
- map->offset.x++;
+ offset = center_offset(win->center.x, map_size.x, win->framesize.x);
+ win->center.x = offset + (win->framesize.x / 2);
+ if (WEST == d && win->center.x > 0)
+ {
+ win->center.x--;
+ }
+ else if (EAST == d && win->center.x < map_size.x - 1)
+ {
+ win->center.x++;
+ }
}
}
-
-
-
-void map_center_player(struct Map * map, struct Player * player,
- 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);
-}