X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmisc.c;h=8a782732a1621adbbd56f253b29b3a370a475cd8;hb=40c680b389bd2c3f1376aeda3f5abb049a0022ef;hp=0bb50a76fa4c7831ccfece4f41bab471c30b46ae;hpb=7bebc9943d1648d56968146b17c9459affb183c6;p=plomrogue diff --git a/src/misc.c b/src/misc.c index 0bb50a7..8a78273 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,8 +1,11 @@ /* misc.c */ #include "misc.h" +#include /* for rename() */ +#include /* for unlink(), acess() */ #include /* for calloc(), free() */ #include /* for strlen(), strcmp(), memcpy() */ +#include /* for uint8_t */ #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), * resize_active_win(), cycle_active_win(), * shift_active_win(), struct Win, struct WinMeta @@ -10,15 +13,14 @@ #include "keybindings.h" /* for get_action_key(), save_keybindings(), * keyswin_move_selection(), keyswin_mod_key() */ -#include "readwrite.h" /* for write_uint16_bigendian(), write_uint32_bigendian() - */ +#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */ #include "map_objects.h" /* for struct Monster, write_map_objects(), */ #include "map_object_actions.h" /* for is_passable(), move_monster() */ #include "map.h" /* for map_scroll(),map_center_player(), Map struct,dir enum */ #include "main.h" /* for World struct */ #include "yx_uint16.h" /* for yx_uint16 */ #include "rrand.h" /* for rrand(), rrand_seed() */ - +#include "rexit.h" /* for exit_err() */ extern void textfile_sizes(FILE * file, uint16_t * linemax_p, @@ -112,12 +114,28 @@ 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_tmp'."; + 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"); - fputc(action, file); - fclose(file); + FILE * file = fopen(recordfile_tmp, "a"); + exit_err(0 == file, world, err_open); + exit_err(write_uint8(action, file), world, err_write); + exit_err(fclose(file), 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); struct Monster * monster; @@ -133,28 +151,49 @@ extern void turn_over(struct World * world, char action) extern void save_game(struct World * world) { - FILE * file = fopen("savefile", "w"); - write_uint32_bigendian(world->seed, file); - write_uint32_bigendian(world->turn, file); - write_uint16_bigendian(world->player->pos.y + 1, file); - write_uint16_bigendian(world->player->pos.x + 1, file); - fputc(world->player->hitpoints, file); - write_map_objects(world, world->monster, file); - write_map_objects(world, world->item, file); - fclose(file); + 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"; + 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->player->pos.y + 1, file) + || write_uint16_bigendian(world->player->pos.x + 1, file) + || write_uint8(world->player->hitpoints, file) + || write_map_objects(world, world->monster, file) + || write_map_objects(world, world->item, file)) + { + exit_err(1, world, err_write); + } + exit_err(fclose(file), world, err_close); + if (!access(savefile, F_OK)) + { + exit_err(unlink(savefile), world, err_unl); + } + exit_err(rename(savefile_tmp, savefile), world, err_move); } -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); } } @@ -174,7 +213,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) { @@ -195,8 +234,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; } @@ -214,13 +254,15 @@ extern struct yx_uint16 find_passable_pos(struct Map * map) -extern unsigned char 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) +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) { + char * err_toggle = "Trouble with toggle_window() in meta_keys()."; + char * err_shift = "Trouble with shift_active_win() in meta_keys()."; + char * err_resize = "Trouble with growshrink_active_window() in " + "meta_keys()."; if (key == get_action_key(world->keybindings, "quit")) { return 1; @@ -235,51 +277,51 @@ extern unsigned char meta_keys(int key, struct World * world, } else if (key == get_action_key(world->keybindings, "toggle keys window")) { - toggle_window(win_meta, win_keys); + exit_err(toggle_window(win_meta, win_keys), world, err_toggle); } else if (key == get_action_key(world->keybindings, "toggle map window")) { - toggle_window(win_meta, win_map); + exit_err(toggle_window(win_meta, win_map), world, err_toggle); } else if (key == get_action_key(world->keybindings, "toggle info window")) { - toggle_window(win_meta, win_info); + exit_err(toggle_window(win_meta, win_info), world, err_toggle); } else if (key == get_action_key(world->keybindings, "toggle log window")) { - toggle_window(win_meta, win_log); + exit_err(toggle_window(win_meta, win_log), world, err_toggle); } else if (key == get_action_key(world->keybindings, "cycle forwards")) { - cycle_active_win(win_meta, 'n'); + cycle_active_win(win_meta, 'f'); } else if (key == get_action_key(world->keybindings, "cycle backwards")) { - cycle_active_win(win_meta, 'p'); + cycle_active_win(win_meta, 'b'); } else if (key == get_action_key(world->keybindings, "shift forwards")) { - shift_active_win(win_meta, 'f'); + exit_err(shift_active_win(win_meta, 'f'), world, err_shift); } else if (key == get_action_key(world->keybindings, "shift backwards")) { - shift_active_win(win_meta, 'b'); + exit_err(shift_active_win(win_meta, 'b'), world, err_shift); } else if (key == get_action_key(world->keybindings, "grow horizontally")) { - growshrink_active_window(win_meta, '*'); + exit_err(growshrink_active_window(win_meta, '*'), world, err_resize); } else if (key == get_action_key(world->keybindings, "shrink horizontally")) { - growshrink_active_window(win_meta, '_'); + exit_err(growshrink_active_window(win_meta, '_'), world, err_resize); } else if (key == get_action_key(world->keybindings, "grow vertically")) { - growshrink_active_window(win_meta, '+'); + exit_err(growshrink_active_window(win_meta, '+'), world, err_resize); } else if (key == get_action_key(world->keybindings, "shrink vertically")) { - growshrink_active_window(win_meta, '-'); + exit_err(growshrink_active_window(win_meta, '-'), world, err_resize); } else if (key == get_action_key(world->keybindings, "save keys")) {