X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmisc.c;h=a4781c9f72d90b848283c69433b7f75450c7a53f;hb=caf7e50574dc4fb3756a386257863e5b8b42ad98;hp=697c182f7ae2b856c96e15a1727ddac84c8c46b0;hpb=55178f6102ba0cba96e52b03edb226e8f7ad686c;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index 697c182..a4781c9 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,44 +160,50 @@ 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 * savefile = "savefile";
FILE * file = fopen(savefile_tmp, "w");
- exit_err(0 == file, world, "Error saving game: "
- "Unable to open new savefile for writing.");
+ 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, "Error saving game: "
- "Trouble writing to opened new savefile.");
+ exit_err(1, world, err_write);
}
- exit_err(fclose(file), world, "Error saving game: "
- "Unable to close opened new savefile.");
+ exit_err(fclose(file), world, err_close);
if (!access(savefile, F_OK))
{
- exit_err(unlink(savefile), world, "Error saving game: "
- "Unable to unlink old savefile.");
+ exit_err(unlink(savefile), world, err_unl);
}
- exit_err(rename(savefile_tmp, "savefile"), world, "Error saving game: "
- "Unable to rename 'savefile_tmp' to 'savefile'.");
+ 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);
}
}
@@ -192,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)
{
@@ -213,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;
}
@@ -232,11 +264,17 @@ extern struct yx_uint16 find_passable_pos(struct Map * map)
-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)
+extern uint8_t meta_keys(int key, struct World * world)
{
+ struct WinMeta * win_meta = world->wins.meta;
+ struct Win * win_keys = world->wins.keys;
+ struct Win * win_map = world->wins.map;
+ struct Win * win_info = world->wins.info;
+ struct Win * win_log = world->wins.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;
@@ -251,51 +289,51 @@ extern uint8_t 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"))
{