X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmain.c;h=2d096367c85192d34095cb2abd8935b98a4ca6ee;hb=10680a2398daf76e6a0cd261c2b247e6902f2ad0;hp=88264072da69f3673bda0b27e2e84b01a11e8ae3;hpb=7290dec4219eaa2325aa00ef6139f715743dba3a;p=plomrogue diff --git a/src/main.c b/src/main.c index 8826407..2d09636 100644 --- a/src/main.c +++ b/src/main.c @@ -10,9 +10,9 @@ #include "windows.h" /* for structs WinMeta, Win, init_win_meta(), * draw_all_wins() */ -#include "readwrite.h" /* for read_uint32_bigendian](), +#include "readwrite.h" /* for try_fgetc(), read_uint32_bigendian(), * write_uint32_bigendian(), try_fopen(), try_fclose(), - * try_fclose_unlink_rename() + * try_fclose_unlink_rename(), try_fgetc_noeof(), */ #include "map_objects.h" /* for structs MapObj, init_map_object_defs(), * build_map_objects(), get_player() @@ -20,13 +20,15 @@ #include "map.h" /* for struct Map, init_map() */ #include "misc.h" /* for update_log(), find_passable_pos(), save_game(), * try_calloc(), check_tempfile(), check_xor_files(), - * load_interface_conf(), load_game() + * load_interface_conf(), load_game(), rrand() */ #include "wincontrol.h" /* get_win_by_id(), get_winconf_by_win() */ -#include "rrand.h" /* for rrand(), rrand_seed() */ -#include "rexit.h" /* for exit_game(), exit_err() */ +#include "rexit.h" /* for exit_game() */ #include "command_db.h" /* for init_command_db(), is_command_id_shortdsc() */ -#include "control.h" /* for *_control(), get_available_keycode_to_action() */ +#include "control.h" /* for control_by_id(), player_control(), + * get_available_keycode_to_action() + */ +#include "map_object_actions.h" /* for init_map_object_actions() */ @@ -35,8 +37,11 @@ int main(int argc, char *argv[]) char * f_name = "main()"; world.turn = 0; /* Turns to 1 when map and objects are initalized. */ + /* Initialize commands and map object actions. */ init_command_db(); set_cleanup_flag(CLEANUP_COMMAND_DB); + init_map_object_actions(); + set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS); /* Check for corrupted savefile / recordfile savings. */ char * recordfile = "record"; @@ -87,8 +92,6 @@ int main(int argc, char *argv[]) world.map_obj_count = 0; /* For interactive mode, try to load world state from savefile. */ - char * err_r = "Trouble loading game (in main()) / " - "reading from opened 'savefile'."; FILE * file; if (1 == world.interactive && 0 == access(savefile, F_OK)) { @@ -99,12 +102,10 @@ int main(int argc, char *argv[]) /* For non-interactive mode, try to load world state from record file. */ else { - err_r = "Trouble reading from 'record' file (read_uint32_bigendian() " - "in main())."; if (0 == world.interactive) { file = try_fopen(recordfile, "r", f_name); - exit_err(read_uint32_bigendian(file, &world.seed), err_r); + world.seed = read_uint32_bigendian(file); } /* For interactive-mode in newly started world, generate a start seed @@ -113,20 +114,18 @@ int main(int argc, char *argv[]) else { world.seed = time(NULL); - - char * err_w = "Trouble recording new seed " - "(write_uint32_bigendian() in main()) / writing to " - "file 'record_tmp'."; file = try_fopen(recordfile_tmp, "w", f_name); - exit_err(write_uint32_bigendian(world.seed, file), err_w); + write_uint32_bigendian(world.seed, file); try_fclose_unlink_rename(file, recordfile_tmp, recordfile, f_name); } + world.mapseed = world.seed; } /* Generate map from seed and, if newly generated world, start positions of * actors. */ - rrand_seed(world.seed); + uint32_t restore_seed = world.seed; + world.seed = world.mapseed; struct Map map = init_map(); world.map = ↦ set_cleanup_flag(CLEANUP_MAP); @@ -142,20 +141,17 @@ int main(int argc, char *argv[]) set_cleanup_flag(CLEANUP_MAP_OBJECTS); world.turn = 1; } + world.seed = restore_seed; /* Initialize window system and windows. */ - WINDOW * screen = initscr(); + init_win_meta(); set_cleanup_flag(CLEANUP_NCURSES); noecho(); curs_set(0); - keypad(screen, TRUE); + keypad(world.wmeta->screen, TRUE); raw(); - char * err_winmem = "Trouble with init_win_meta() in main ()."; - exit_err(init_win_meta(screen, &world.wmeta), err_winmem); - set_cleanup_flag(CLEANUP_WIN_META); - load_interface_conf(/*&world*/); - set_cleanup_flag(CLEANUP_INTERFACE_CONF); - err_winmem = "Trouble with draw_all_wins() in main()."; + load_interface_conf(); + set_cleanup_flag(CLEANUP_INTERFACE); /* Focus map on player. */ struct MapObj * player = get_player(); @@ -175,21 +171,22 @@ int main(int argc, char *argv[]) { while (world.turn != start_turn) { - action = getc(file); + action = try_fgetc(file, f_name); if (EOF == action) { break; } - if (is_command_id_shortdsc(action, "drop")) + if ( is_command_id_shortdsc(action, "drop") + || is_command_id_shortdsc(action, "use")) { - world.inventory_select = getc(file); + world.inventory_select = try_fgetc_noeof(file, f_name); } - record_control(action); + player_control_by_id(action); } } while (1) { - draw_all_wins(world.wmeta); + draw_all_wins(); key = getch(); wc = get_winconf_by_win(world.wmeta->active); if ( (1 == wc->view && wingeom_control(key)) @@ -200,14 +197,15 @@ int main(int argc, char *argv[]) if ( EOF != action && key == get_available_keycode_to_action("wait")) { - action = getc(file); + action = try_fgetc(file, f_name); if (EOF != action) { - if (is_command_id_shortdsc(action, "drop")) + if ( is_command_id_shortdsc(action, "drop") + || is_command_id_shortdsc(action, "use")) { - world.inventory_select = getc(file); + world.inventory_select = try_fgetc_noeof(file, f_name); } - record_control(action); + player_control_by_id(action); } } else if (meta_control(key)) @@ -224,25 +222,15 @@ int main(int argc, char *argv[]) while (1) { save_game(); - draw_all_wins(world.wmeta); + draw_all_wins(); key = getch(); wc = get_winconf_by_win(world.wmeta->active); - if (1 == wc->view && wingeom_control(key)) - { - continue; - } - else if (2 == wc->view && winkeyb_control(key)) - { - continue; - } - if ( (1 == wc->view && wingeom_control(key)) || (2 == wc->view && winkeyb_control(key)) - || (0 != player->lifepoints && player_control(key))) + || (0 != player->lifepoints && player_control_by_key(key))) { continue; } - if (meta_control(key)) { exit_game();