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) {
world->turn++;
rrand(1, world->seed * world->turn);
struct Monster * monster;
- for (monster = world->monster; monster != 0; monster = monster->next)
+ for (monster = world->monster; monster != 0; monster = monster->cmo.next)
move_monster(world, monster); }
void save_game(struct World * world) {
write_uint32_bigendian(world->turn, file);
write_uint16_bigendian(world->player->pos.y + 1, file);
write_uint16_bigendian(world->player->pos.x + 1, file);
- struct Monster * monster;
- for (monster = world->monster; monster != 0; monster = monster->next) {
- write_uint16_bigendian(monster->pos.y + 1, file);
- write_uint16_bigendian(monster->pos.x + 1, file);
- fputc(monster->name, file); }
- write_uint16_bigendian(0, file);
- struct Item * item;
- for (item = world->item; item != 0; item = item->next) {
- write_uint16_bigendian(item->pos.y + 1, file);
- write_uint16_bigendian(item->pos.x + 1, file);
- fputc(item->name, file); }
- write_uint16_bigendian(0, file);
+ write_map_objects (world->monster, file, write_map_objects_monsterdata);
+ write_map_objects (world->item, file, readwrite_map_objects_dummy);
fclose(file); }
void toggle_window (struct WinMeta * win_meta, struct Win * win) {
update_log (&world, " ");
struct Player player;
world.player = &player;
- struct Monster * monster;
- struct Item * item;
- uint16_t test;
- char start;
+ world.monster = 0;
+ world.item = 0;
// For interactive mode, try to load world state from savefile.
FILE * file;
world.turn = read_uint32_bigendian(file);
player.pos.y = read_uint16_bigendian(file) - 1;
player.pos.x = read_uint16_bigendian(file) - 1;
- start = 1;
- world.monster = 0;
- while (1) {
- test = read_uint16_bigendian(file);
- if (0 == test)
- break;
- if (start) {
- monster = malloc(sizeof(struct Monster));
- world.monster = monster;
- start = 0; }
- else {
- monster->next = malloc(sizeof(struct Monster));
- monster = monster->next; }
- monster->pos.y = test - 1;
- monster->pos.x = read_uint16_bigendian(file) - 1;
- monster->name = fgetc(file); }
- if (!start)
- monster->next = 0;
- start = 1;
- world.item = 0;
- while (1) {
- test = read_uint16_bigendian(file);
- if (0 == test)
- break;
- if (start) {
- item = malloc(sizeof(struct Item));
- world.item = item;
- start = 0; }
- else {
- item->next = malloc(sizeof(struct Item));
- item = item->next; }
- item->pos.y = test - 1;
- item->pos.x = read_uint16_bigendian(file) - 1;
- item->name = fgetc(file); }
- if (!start)
- item->next = 0;
+ read_map_objects (&world.monster, file, sizeof(struct Monster), read_map_objects_monsterdata);
+ read_map_objects (&world.item, file, sizeof(struct Item), readwrite_map_objects_dummy);
fclose(file); }
// For non-interactive mode, try to load world state from record file.
player.pos = find_passable_pos(&map);
unsigned char n_monsters = rrand(0, 0) % 16;
unsigned char n_items = rrand(0, 0) % 48;
- unsigned char i;
- start = 1;
- world.monster = 0;
- for (i = 0; i < n_monsters; i++) {
- if (start) {
- monster = malloc(sizeof(struct Monster));
- world.monster = monster;
- start = 0; }
- else {
- monster->next = malloc(sizeof(struct Monster));
- monster = monster->next; }
- monster->pos = find_passable_pos(&map);
- monster->name = 'A' + (rrand(0, 0) % 8); }
- if (!start)
- monster->next = 0;
- start = 1;
- world.item = 0;
- for (i = 0; i < n_items; i++) {
- if (start) {
- item = malloc(sizeof(struct Item));
- world.item = item;
- start = 0; }
- else {
- item->next = malloc(sizeof(struct Item));
- item = item->next; }
- item->pos = find_passable_pos(&map);
- item->name = '#' + (rrand(0, 0) % 4); }
- if (!start)
- item->next = 0; }
+ build_map_objects (&world.monster, n_monsters, sizeof(struct Monster), build_map_objects_monsterdata, &map);
+ build_map_objects (&world.item, n_items, sizeof(struct Item), build_map_objects_itemdata, &map); }
// Initialize window system and windows.
WINDOW * screen = initscr();