From: Christian Heller Date: Wed, 10 Jul 2013 22:18:17 +0000 (+0200) Subject: Addendum to previous commit: Added files mentioned but forgotten. X-Git-Tag: tce~1159 X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7B%20web_path%20%7D%7D/process?a=commitdiff_plain;h=8e2ccd2e08bf2a08049c6c04ea24d79d161b4945;p=plomrogue Addendum to previous commit: Added files mentioned but forgotten. --- diff --git a/src/map.c b/src/map.c new file mode 100644 index 0000000..6ee6774 --- /dev/null +++ b/src/map.c @@ -0,0 +1,51 @@ +#include "map.h" +#include +#include +#include "roguelike.h" +#include "objects_on_map.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); } + diff --git a/src/map.h b/src/map.h new file mode 100644 index 0000000..c5ceb94 --- /dev/null +++ b/src/map.h @@ -0,0 +1,17 @@ +#ifndef MAP_H +#define MAP_H + +#include "yx_uint16.h" + +struct Player; + +struct Map { + struct yx_uint16 size; + struct yx_uint16 offset; + char * cells; }; + +extern struct Map init_map (); +extern void map_scroll (struct Map *, char, struct yx_uint16); +extern void map_center_player (struct Map *, struct Player *, struct yx_uint16); + +#endif