*/
#include "map_objects.h" /* for structs Monster, Item, Player,
* init_map_object_defs(), read_map_objects(),
- * read_map_objects_monsterdata,
- * read_map_objects_itemdata, build_map_objects()
+ * build_map_objects()
*/
#include "map_object_actions.h" /* for player_wait(), move_player() */
#include "map.h" /* for struct Map, init_map() */
-#include "misc.h" /* for rrand(), update_log(), toggle_window(), exit_game(),
+#include "misc.h" /* for update_log(), toggle_window(), exit_game(),
* find_passable_pos(), meta_keys(), save_game()
*/
#include "yx_uint16.h" /* for dir enum */
+#include "rrand.h" /* for rrand(), rrand_seed() */
int main(int argc, char *argv[])
{
player.pos.y = read_uint16_bigendian(file) - 1;
player.pos.x = read_uint16_bigendian(file) - 1;
player.hitpoints = fgetc(file);
- read_map_objects(&world.monster, file, sizeof(struct Monster),
- read_map_objects_monsterdata);
- read_map_objects(&world.item, file, sizeof(struct Item), NULL);
+ read_map_objects(&world, &world.monster, file);
+ read_map_objects(&world, &world.item, file);
fclose(file);
}
/* Generate map from seed and, if newly generated world, start positions of
* actors.
*/
- rrand(1, world.seed);
+ rrand_seed(world.seed);
struct Map map = init_map();
world.map = ↦
if (1 == world.turn)
{
player.pos = find_passable_pos(&map);
- void * foo = build_map_objects(&world, &world.monster,
- 0, 1 + rrand(0,0) % 27,
- sizeof(struct Monster),
- build_map_objects_monsterdata);
- foo = build_map_objects(&world, foo, 1, 1 + rrand(0,0) % 9,
- sizeof(struct Monster),
- build_map_objects_monsterdata);
- build_map_objects(&world, foo, 2, 1 + rrand(0,0) % 3,
- sizeof(struct Monster),
- build_map_objects_monsterdata);
- foo = build_map_objects(&world, &world.item, 3, 1 + rrand(0,0) % 3,
- sizeof(struct Item),
- build_map_objects_itemdata);
- build_map_objects(&world, foo, 4, 1 + rrand(0,0) % 3,
- sizeof(struct Item), build_map_objects_itemdata);
+ void * foo;
+ foo = build_map_objects(&world, &world.monster, 1, 1 + rrand() % 27);
+ foo = build_map_objects(&world, foo, 2, 1 + rrand() % 9);
+ build_map_objects(&world, foo, 3, 1 + rrand() % 3);
+ foo = build_map_objects(&world, &world.item, 4, 1 + rrand() % 3);
+ build_map_objects(&world, foo, 5, 1 + rrand() % 3);
}
/* Initialize window system and windows. */
raw();
init_keybindings(&world);
struct WinMeta win_meta = init_win_meta(screen);
- struct Win win_keys = init_win(&win_meta, "Keys", &world, draw_keys_win);
- struct Win win_map = init_win(&win_meta, "Map", &world, draw_map_win);
- struct Win win_info = init_win(&win_meta, "Info", &world, draw_info_win);
- struct Win win_log = init_win(&win_meta, "Log", &world, draw_log_win);
- win_keys.frame.size.x = 29;
- win_map.frame.size.x = win_meta.padframe.size.x - win_keys.frame.size.x
- - win_log.frame.size.x - 2;
- win_info.frame.size.y = 2;
- win_log.frame.size.y = win_meta.padframe.size.y
- - (2 + win_info.frame.size.y);
+ struct Win win_keys = init_win(&win_meta, "Keys", 0, 29, &world, draw_keys_win);
+ struct Win win_info = init_win(&win_meta, "Info", 2, 20, &world, draw_info_win);
+ uint16_t height_logwin = win_meta.padframe.size.y - (2 + win_info.frame.size.y);
+ struct Win win_log = init_win(&win_meta, "Log",
+ height_logwin, 20, &world, draw_log_win);
+ uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x
+ - win_log.frame.size.x - 2;
+ struct Win win_map = init_win(&win_meta, "Map",
+ 0, width_mapwin, &world, draw_map_win);
toggle_window(&win_meta, &win_keys);
toggle_window(&win_meta, &win_map);
toggle_window(&win_meta, &win_info);