X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmain.c;h=24e0058d684247890d9bfbd64395d5a18bc3c7c0;hb=b4d3dd91f438b97be97afa51e7a0c208f1ae475b;hp=80e7b011c97ffc0ad2f8a55a8a88be97b7c54a60;hpb=7815e738f77aad4e918c84a89aa21f7ae683ebab;p=plomrogue diff --git a/src/main.c b/src/main.c index 80e7b01..24e0058 100644 --- a/src/main.c +++ b/src/main.c @@ -6,6 +6,7 @@ #include /* for initscr(), noecho(), curs_set(), keypad(), raw() */ #include /* for time() */ #include /* for getopt(), optarg */ +#include /* for uint8_t */ #include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(), * draw_all_wins() */ @@ -13,21 +14,19 @@ * draw_log_win() */ #include "keybindings.h" /* for initkeybindings(), get_action_key() */ -#include "readwrite.h" /* for read_uint16_bigendian, read_uint32_bigendian, - * write_uint32_bigendian - */ +#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */ #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 update_log(), toggle_window(), exit_game(), - * find_passable_pos(), meta_keys(), save_game() +#include "misc.h" /* for update_log(), toggle_window(), find_passable_pos(), + * meta_keys(), save_game() */ #include "yx_uint16.h" /* for dir enum */ #include "rrand.h" /* for rrand(), rrand_seed() */ +#include "rexit.h" /* for exit_game() */ int main(int argc, char *argv[]) { @@ -54,6 +53,7 @@ int main(int argc, char *argv[]) /* Initialize log, player, monster/item definitions and monsters/items. */ world.log = calloc(1, sizeof(char)); + set_cleanup_flag(CLEANUP_LOG); update_log (&world, " "); struct Player player; player.hitpoints = 5; @@ -61,20 +61,22 @@ int main(int argc, char *argv[]) world.monster = 0; world.item = 0; init_map_object_defs(&world, "defs"); + uint8_t err = 0; /* For interactive mode, try to load world state from savefile. */ FILE * file; if (1 == world.interactive && 0 == access("savefile", F_OK)) { file = fopen("savefile", "r"); - world.seed = read_uint32_bigendian(file); - world.turn = read_uint32_bigendian(file); - 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); + err = err | read_uint32_bigendian(file, &world.seed); + err = err | read_uint32_bigendian(file, &world.turn); + err = err | read_uint16_bigendian(file, &player.pos.y); + err = err | read_uint16_bigendian(file, &player.pos.x); + player.pos.y--; + player.pos.x--; + err = err | read_uint8(file, &player.hitpoints); + err = err | read_map_objects(&world, &world.monster, file); + err = err | read_map_objects(&world, &world.item, file); fclose(file); } @@ -85,20 +87,23 @@ int main(int argc, char *argv[]) if (0 == world.interactive) { file = fopen("record", "r"); - world.seed = read_uint32_bigendian(file); + err = err | read_uint32_bigendian(file, &world.seed); + } + + /* For interactive-mode in newly started world, generate a start seed + * from the current time. + */ + else + { + file = fopen("record", "w"); + world.seed = time(NULL); + err = err | write_uint32_bigendian(world.seed, file); + fclose(file); } + } + + exit_err(err, &world, "Failure initializing game."); - /* For interactive-mode in newly started world, generate a start seed - * from the current time. - */ - else - { - file = fopen("record", "w"); - world.seed = time(NULL); - write_uint32_bigendian(world.seed, file); - fclose(file); - } - } /* Generate map from seed and, if newly generated world, start positions of * actors. @@ -106,37 +111,34 @@ int main(int argc, char *argv[]) rrand_seed(world.seed); struct Map map = init_map(); world.map = ↦ + set_cleanup_flag(CLEANUP_MAP); if (1 == world.turn) { - player.pos = find_passable_pos(&map); - void * foo = build_map_objects(&world, &world.monster, - 0, 1 + rrand() % 27, - sizeof(struct Monster), - build_map_objects_monsterdata); - foo = build_map_objects(&world, foo, 1, 1 + rrand() % 9, - sizeof(struct Monster), - build_map_objects_monsterdata); - build_map_objects(&world, foo, 2, 1 + rrand() % 3, - sizeof(struct Monster), - build_map_objects_monsterdata); - foo = build_map_objects(&world, &world.item, 3, 1 + rrand() % 3, - sizeof(struct Item), - build_map_objects_itemdata); - build_map_objects(&world, foo, 4, 1 + rrand() % 3, - sizeof(struct Item), build_map_objects_itemdata); + player.pos = find_passable_pos(world.map); + 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. */ WINDOW * screen = initscr(); + set_cleanup_flag(CLEANUP_NCURSES); noecho(); curs_set(0); keypad(screen, TRUE); raw(); init_keybindings(&world); + set_cleanup_flag(CLEANUP_KEYBINDINGS); struct WinMeta win_meta = init_win_meta(screen); - 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_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 @@ -150,8 +152,8 @@ int main(int argc, char *argv[]) /* Replay mode. */ int key; - unsigned char quit_called = 0; - unsigned char await_actions = 1; + uint8_t quit_called = 0; + uint8_t await_actions = 1; if (0 == world.interactive) { int action; @@ -204,7 +206,7 @@ int main(int argc, char *argv[]) &win_map, &win_info, &win_log); if (1 == quit_called) { - exit_game(&world, &map); + exit_game(&world); } } } @@ -263,7 +265,7 @@ int main(int argc, char *argv[]) &win_map, &win_info, &win_log); if (1 == quit_called) { - exit_game(&world, &map); + exit_game(&world); } } }