X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmisc.c;h=4b25f65f5c05b387d3bfc359e76018411c30676f;hb=0568c1c0f6735509f2a1afea31ecb5dc28f26bf4;hp=dac4c974f07767228510e4444583a02be3f43d38;hpb=922021e2cd00437584ba5138c980a62e0ac3f984;p=plomrogue diff --git a/src/misc.c b/src/misc.c index dac4c97..4b25f65 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,42 +1,42 @@ /* 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 - */ -#include "keybindings.h" /* for get_action_key(), save_keybindings(), - * keyswin_move_selection(), keyswin_mod_key() - */ +#include /* for uint8_t, uint16_t */ #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 "map.h" /* for Map struct */ #include "main.h" /* for World struct */ -#include "yx_uint16.h" /* for yx_uint16 */ +#include "yx_uint16.h" /* for yx_uint16 struct */ #include "rrand.h" /* for rrand(), rrand_seed() */ #include "rexit.h" /* for exit_err() */ -extern void textfile_sizes(FILE * file, uint16_t * linemax_p, - uint16_t * n_lines_p) + +extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p, + uint16_t * n_lines_p) { - uint16_t n_lines = 0; int c = 0; - uint16_t linemax = 0; uint16_t c_count = 0; - while (EOF != c) + uint16_t n_lines = 0; + uint16_t linemax = 0; + while (1) { - c_count++; c = getc(file); + if (EOF == c) + { + break; + } + c_count++; if ('\n' == c) { if (c_count > linemax) { - linemax = c_count + 1; + linemax = c_count; } c_count = 0; if (n_lines_p) @@ -45,22 +45,31 @@ extern void textfile_sizes(FILE * file, uint16_t * linemax_p, } } } - fseek(file, 0, SEEK_SET); + if (0 == linemax && 0 < c_count) /* Handle files that consist of only one */ + { /* line / lack newline chars. */ + linemax = c_count; + } + + if (-1 == fseek(file, 0, SEEK_SET)) + { + return 1; + } * linemax_p = linemax; if (n_lines_p) { * n_lines_p = n_lines; } + return 0; } extern void update_log(struct World * world, char * text) { - static char * last_msg; - if (0 == last_msg) - { - last_msg = calloc(1, sizeof(char)); + static char * last_msg; /* TODO: valgrind is dissatisfied */ + if (0 == last_msg) /* with this calloc'd pointer */ + { /* never being freed. */ + last_msg = calloc(1, sizeof(char)); /* Rectify this ? */ } char * new_text; uint16_t len_old = strlen(world->log); @@ -112,11 +121,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); @@ -133,76 +167,37 @@ extern void turn_over(struct World * world, char action) extern void save_game(struct World * world) { - char * err_msg = "Error saving game."; - - FILE * file = fopen("savefile", "w"); - exit_err(0 == file, world, err_msg); - - uint8_t err; - err = write_uint32_bigendian(world->seed, file); - err = err | write_uint32_bigendian(world->turn, file); - err = err | write_uint16_bigendian(world->player->pos.y + 1, file); - err = err | write_uint16_bigendian(world->player->pos.x + 1, file); - err = err | write_uint8(world->player->hitpoints, file); - err = err | write_map_objects(world, world->monster, file); - err = err | write_map_objects(world, world->item, file); - exit_err(err, world, err_msg); - fclose(file); -} - - - -extern void toggle_window(struct WinMeta * win_meta, struct Win * win) -{ - if (0 != win->frame.curses_win) - { - suspend_win(win_meta, win); - } - else - { - append_win(win_meta, win); - } -} - - - -extern void scroll_pad(struct WinMeta * win_meta, char dir) -{ - if ('+' == dir) - { - reset_pad_offset(win_meta, win_meta->pad_offset + 1); - } - else if ('-' == dir) - { - reset_pad_offset(win_meta, win_meta->pad_offset - 1); - } -} - - - -extern void growshrink_active_window(struct WinMeta * win_meta, char change) -{ - if (0 != win_meta->active) - { - struct yx_uint16 size = win_meta->active->frame.size; - if (change == '-') - { - size.y--; - } - else if (change == '+') - { - size.y++; - } - else if (change == '_') - { - size.x--; - } - else if (change == '*') - { - size.x++; - } - resize_active_win (win_meta, size); - } + 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->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) + || 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); } @@ -217,109 +212,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; -}