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 repeats, root, curpos;
- for (root = 0; root * root * root < size; root++);
- for (repeats = 0; repeats < size * root; repeats++) {
+ 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;
( (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])))
- map.cells[y * map.size.x + x] = '.'; }
+ || (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) {
map_scroll (world->map, WEST);
return 0; }
-void write_map_objects_monsterdata (void * start, FILE * file) {
-// Write to file data specific tto map objects of type monster.
- struct Monster * monster = (struct Monster *) start;
- fputc(monster->hitpoints, file); }
-
-void readwrite_map_objects_dummy (void * dummy, FILE * file) {
-// Dummy function for calls of (write|read)_map_objects on map objects without specific attributes.
- ; }
-
-void write_map_objects (void * start, FILE * file, void (* f) (void *, FILE *) ) {
-// Write into file the map object chain starting at start, use f() for object-type specific data.
- struct ChainMapObject * cmo;
- for (cmo = start; cmo != 0; cmo = cmo->next) {
- write_uint16_bigendian(cmo->pos.y + 1, file);
- write_uint16_bigendian(cmo->pos.x + 1, file);
- fputc(cmo->name, file);
- f (cmo, file); }
- write_uint16_bigendian(0, file); }
-
-void read_map_objects_monsterdata (void * start, FILE * file) {
-// Read from file data speciifc to map objects of type monster.
- struct Monster * monster = (struct Monster *) start;
- monster->hitpoints = fgetc(file); }
-
-void read_map_objects (void * start, FILE * file, size_t size, void (* f) (void *, FILE *) ) {
-// Read from file chain of map objects starting at start, use f() for object-type specific data.
- int * q = start;
- * q = 0;
- struct ChainMapObject * cmo;
- struct ChainMapObject * * z = start;
- uint16_t test;
- char still_at_start = 1;
- while (1) {
- test = read_uint16_bigendian(file);
- if (0 == test)
- break;
- if (still_at_start) {
- cmo = malloc(size);
- * z = cmo;
- still_at_start = 0; }
- else {
- cmo->next = malloc(size);
- cmo = cmo->next; }
- cmo->pos.y = test - 1;
- cmo->pos.x = read_uint16_bigendian(file) - 1;
- cmo->name = fgetc(file);
- f (cmo, file); }
- if (!still_at_start)
- cmo->next = 0; }
-
-void build_map_objects_monsterdata (void * start) {
-// Build data specific to map objects of type monster.
- struct Monster * monster = (struct Monster *) start;
- monster->cmo.name = 'A' + (rrand(0, 0) % 8);
- monster->hitpoints = 5; }
-
-void build_map_objects_itemdata (void * start) {
-// Build data speciifc to map objects of type data.
- struct Item * item = (struct Item *) start;
- item->cmo.name = '#' + (rrand(0, 0) % 4); }
-
-void build_map_objects (void * start, unsigned char n, size_t size, void (* f) (void *), struct Map * map) {
-// Build chain of n map objects starting at start, use f() for object-specific data.
- int * q = start;
- * q = 0;
- unsigned char i;
- struct ChainMapObject * cmo;
- struct ChainMapObject * * z = start;
- char still_at_start = 1;
- for (i = 0; i < n; i++) {
- if (still_at_start) {
- cmo = malloc(size);
- * z = cmo;
- still_at_start = 0; }
- else {
- cmo->next = malloc(size);
- cmo = cmo->next; }
- cmo->pos = find_passable_pos(map);
- f(cmo); }
- if (!still_at_start)
- cmo->next = 0; }
-
int main (int argc, char *argv[]) {
struct World world;
update_log (&world, " ");
struct Player player;
world.player = &player;
+ world.monster = 0;
+ world.item = 0;
// For interactive mode, try to load world state from savefile.
FILE * file;