X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.c;h=238da3eca884c084d72eebc4ad4c8a4cb9c81b9f;hb=3ba2e97b20baea88bd6738e95b9c592c9cf07520;hp=44e9a0871edb76caf22790fcfd71ec40103ef8ec;hpb=90878822be431b08d08921a2bc19dcc04b7524c9;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index 44e9a08..238da3e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -114,16 +114,16 @@ 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 'record_tmp' for appending.";
- char * err_write = "Error recording move: "
- "Trouble writing to opened 'record_tmp'.";
- char * err_close = "Error recording move: "
- "Unable to close opened 'record_tmp'.";
- char * err_unl = "Error recording move: "
- "Unable to unlink old 'record' file.";
- char * err_move = "Error recording move: "
- "Unable to rename 'record_tmp' to 'record'.";
+ 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)
@@ -151,16 +151,16 @@ 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 'savefile_tmp' for writing.";
- char * err_write = "Error saving game: "
- "Trouble writing to opened 'savefile_tmp'.";
- char * err_close = "Error saving game: "
- "Unable to close opened 'savefile_tmp'.";
- char * err_unl = "Error saving game: "
- "Unable to unlink old 'savefile'.";
- char * err_move = "Error saving game: "
- "Unable to rename 'savefile_tmp' to 'savefile'.";
+ 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");
@@ -185,15 +185,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);
}
}
@@ -213,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)
{
@@ -234,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;
}
@@ -258,6 +259,10 @@ 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 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;
@@ -272,23 +277,23 @@ 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"))
{
@@ -296,27 +301,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"))
{