X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmisc.c;h=1fbcc3ecdce4a318e911e75928c1322e29d19c8f;hb=fcf58a650b9c0a9c3aa08c2c25ea14d70e08f8c7;hp=711e049db2c067527924aaad8fab26b67ab394f8;hpb=26fb22669c47b1191264d840ad240f2b901327d5;p=plomrogue diff --git a/src/misc.c b/src/misc.c index 711e049..1fbcc3e 100644 --- a/src/misc.c +++ b/src/misc.c @@ -114,11 +114,36 @@ extern uint16_t center_offset(uint16_t pos, uint16_t mapsize, extern void turn_over(struct World * world, char action) { + char * err_open = "Trouble in turn_over() with fopen() " + "opening file 'record_tmp' for appending."; + char * err_write = "Trouble in turn_over() with write_uint8() " + "writing to opened file 'record_tmp'."; + char * err_close = "Trouble in turn_over() with fclose() " + "closing opened file 'record'."; + char * err_unl = "Trouble in turn_over() with unlink() " + "unlinking old file 'record'."; + char * err_move = "Trouble in turn_over() with rename() " + "renaming file 'record_tmp' to 'record'."; + char * recordfile_tmp = "record_tmp"; + char * recordfile = "record"; if (1 == world->interactive) { - FILE * file = fopen("record", "a"); - exit_err(write_uint8(action, file), world, "Record writing failure."); - fclose(file); + FILE * file_old = fopen(recordfile, "r"); + FILE * file_new = fopen(recordfile_tmp, "w"); + exit_err(0 == file_old, world, err_open); + char c = fgetc(file_old); + while (EOF != c) + { + exit_err(write_uint8(c, file_new), world, err_write); + c = fgetc(file_old); + } + exit_err(fclose(file_old), world, err_close); + exit_err(write_uint8(action, file_new), world, err_write); + err_close = "Trouble in turn_over() with fclose() " + "closing opened file 'record_tmp'."; + exit_err(fclose(file_new), world, err_close); + exit_err(unlink(recordfile), world, err_unl); + exit_err(rename(recordfile_tmp, recordfile), world, err_move); } world->turn++; rrand_seed(world->seed * world->turn); @@ -135,22 +160,23 @@ extern void turn_over(struct World * world, char action) extern void save_game(struct World * world) { + char * err_open = "Trouble in save_game() with fopen() " + "opening file 'savefile_tmp' for writing."; + char * err_write = "Trouble in save_game() " + "writing to opened file 'savefile_tmp'."; + char * err_close = "Trouble in save_game() with fclose() " + "closing opened file 'savefile_tmp'."; + char * err_unl = "Trouble in save_game() with unlink() " + "unlinking old 'savefile' file."; + char * err_move = "Trouble in save_game() with rename() " + "renaming 'file savefile_tmp' to 'savefile'."; char * savefile_tmp = "savefile_tmp"; char * savefile = "savefile"; - char * err_open = "Error saving game: " - "Unable to open 'savefile_new' for writing."; - char * err_write = "Error saving game: " - "Trouble writing to opened 'savefile_new'."; - char * err_close = "Error saving game: " - "Unable to close opened 'savefile_new'."; - char * err_unl = "Error saving game: " - "Unable to unlink old 'savefile'."; - char * err_move = "Error saving game: " - "Unable to rename 'savefile_tmp' to 'savefile'."; FILE * file = fopen(savefile_tmp, "w"); exit_err(0 == file, world, err_open); if ( write_uint32_bigendian(world->seed, file) || write_uint32_bigendian(world->turn, file) + || write_uint16_bigendian(world->score, file) || write_uint16_bigendian(world->player->pos.y + 1, file) || write_uint16_bigendian(world->player->pos.x + 1, file) || write_uint8(world->player->hitpoints, file) @@ -169,15 +195,15 @@ extern void save_game(struct World * world) -extern void toggle_window(struct WinMeta * win_meta, struct Win * win) +extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win) { if (0 != win->frame.curses_win) { - suspend_win(win_meta, win); + return suspend_win(win_meta, win); } else { - append_win(win_meta, win); + return append_win(win_meta, win); } } @@ -197,7 +223,7 @@ extern void scroll_pad(struct WinMeta * win_meta, char dir) -extern void growshrink_active_window(struct WinMeta * win_meta, char change) +extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change) { if (0 != win_meta->active) { @@ -218,8 +244,9 @@ extern void growshrink_active_window(struct WinMeta * win_meta, char change) { size.x++; } - resize_active_win (win_meta, size); + return resize_active_win (win_meta, size); } + return 0; } @@ -234,109 +261,3 @@ extern struct yx_uint16 find_passable_pos(struct Map * map) } return pos; } - - - -extern uint8_t meta_keys(int key, struct World * world, - struct WinMeta * win_meta, struct Win * win_keys, - struct Win * win_map, struct Win * win_info, - struct Win * win_log) -{ - if (key == get_action_key(world->keybindings, "quit")) - { - return 1; - } - else if (key == get_action_key(world->keybindings, "scroll pad right")) - { - scroll_pad (win_meta, '+'); - } - else if (key == get_action_key(world->keybindings, "scroll pad left")) - { - scroll_pad (win_meta, '-'); - } - else if (key == get_action_key(world->keybindings, "toggle keys window")) - { - toggle_window(win_meta, win_keys); - } - else if (key == get_action_key(world->keybindings, "toggle map window")) - { - toggle_window(win_meta, win_map); - } - else if (key == get_action_key(world->keybindings, "toggle info window")) - { - toggle_window(win_meta, win_info); - } - else if (key == get_action_key(world->keybindings, "toggle log window")) - { - toggle_window(win_meta, win_log); - } - else if (key == get_action_key(world->keybindings, "cycle forwards")) - { - cycle_active_win(win_meta, 'n'); - } - else if (key == get_action_key(world->keybindings, "cycle backwards")) - { - cycle_active_win(win_meta, 'p'); - } - else if (key == get_action_key(world->keybindings, "shift forwards")) - { - shift_active_win(win_meta, 'f'); - } - else if (key == get_action_key(world->keybindings, "shift backwards")) - { - shift_active_win(win_meta, 'b'); - } - else if (key == get_action_key(world->keybindings, "grow horizontally")) - { - growshrink_active_window(win_meta, '*'); - } - else if (key == get_action_key(world->keybindings, "shrink horizontally")) - { - growshrink_active_window(win_meta, '_'); - } - else if (key == get_action_key(world->keybindings, "grow vertically")) - { - growshrink_active_window(win_meta, '+'); - } - else if (key == get_action_key(world->keybindings, "shrink vertically")) - { - growshrink_active_window(win_meta, '-'); - } - else if (key == get_action_key(world->keybindings, "save keys")) - { - save_keybindings(world); - } - else if (key == get_action_key(world->keybindings, "keys nav up")) - { - keyswin_move_selection (world, 'u'); - } - else if (key == get_action_key(world->keybindings, "keys nav down")) - { - keyswin_move_selection (world, 'd'); - } - else if (key == get_action_key(world->keybindings, "keys mod")) - { - keyswin_mod_key (world, win_meta); - } - else if (key == get_action_key(world->keybindings, "map up")) - { - map_scroll (world->map, NORTH, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map down")) - { - map_scroll (world->map, SOUTH, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map right")) - { - map_scroll (world->map, EAST, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map left")) - { - map_scroll (world->map, WEST, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map center player")) - { - map_center_player (world->map, world->player, win_map->frame.size); - } - return 0; -}