X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.c;h=875e11919802986054ef9eeca71ede9646f8e07c;hb=cb6e8f9f28c96974735c5cd5a45ac8e8f1e01422;hp=697c182f7ae2b856c96e15a1727ddac84c8c46b0;hpb=55178f6102ba0cba96e52b03edb226e8f7ad686c;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index 697c182..875e119 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -114,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 = "Error recording move: "
+ "Unable to open file 'record_tmp' for appending.";
+ char * err_write = "Error recording move: "
+ "Trouble writing to opened file 'record_tmp'.";
+ char * err_close = "Error recording move: "
+ "Unable to close opened file 'record_tmp'.";
+ char * err_unl = "Error recording move: "
+ "Unable to unlink old file 'record'.";
+ char * err_move = "Error recording move: "
+ "Unable to rename 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 = 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;
@@ -135,11 +151,20 @@ extern void turn_over(struct World * world, char action)
extern void save_game(struct World * world)
{
+ char * err_open = "Error saving game: "
+ "Unable to open file 'savefile_tmp' for writing.";
+ char * err_write = "Error saving game: "
+ "Trouble writing to opened file 'savefile_tmp'.";
+ char * err_close = "Error saving game: "
+ "Unable to close opened file 'savefile_tmp'.";
+ char * err_unl = "Error saving game: "
+ "Unable to unlink old 'savefile' file.";
+ char * err_move = "Error saving game: "
+ "Unable to rename '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->player->pos.y + 1, file)
@@ -148,31 +173,27 @@ extern void save_game(struct World * world)
|| 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 +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)
{
@@ -213,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;
}
@@ -237,6 +259,9 @@ extern uint8_t meta_keys(int key, struct World * world,
struct Win * win_map, struct Win * win_info,
struct Win * win_log)
{
+ char * err_toggle = "Trouble toggling window.";
+ char * err_shift = "Trouble shifting window.";
+ char * err_resize = "Trouble resizing window.";
if (key == get_action_key(world->keybindings, "quit"))
{
return 1;
@@ -251,19 +276,19 @@ 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"))
{
@@ -275,27 +300,27 @@ extern uint8_t meta_keys(int key, struct World * world,
}
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"))
{