X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fwincontrol.c;h=6371efa919c65b111cc6d2c0d2c5a994c7401b28;hb=fdb7a8eb2bc58d180d53f4085085a62bc1f2e62b;hp=aa705ecacd89f06083eb82fca779f2777d951789;hpb=3edf207d99f9e6e7e4b6beb9939bb9618e4be597;p=plomrogue
diff --git a/src/wincontrol.c b/src/wincontrol.c
index aa705ec..6371efa 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -11,8 +11,9 @@
#include "main.h" /* for world global */
#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
* try_fgets(), try_fclose_unlink_rename(), try_fwrite()
+ * try_fgetc_noeof()
*/
-#include "rexit.h" /* for exit_err() */
+#include "rexit.h" /* for exit_err(), exit_trouble() */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
* draw_win_available_keybindings(),
* draw_win_inventory(), draw_win_keybindings_global(),
@@ -20,7 +21,7 @@
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
*/
-#include "misc.h" /* for try_malloc(), exit_trouble() */
+#include "misc.h" /* for try_malloc() */
#include "dirent.h" /* for opendir(), closedir(), readdir() */
#include "errno.h" /* for errno */
#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
@@ -398,8 +399,7 @@ extern void sorted_wintoggle_and_activate()
uint16_t linemax = get_linemax(file, f_name);
char win_order[linemax + 1];
try_fgets(win_order, linemax + 1, file, f_name);
- uint8_t a;
- exit_trouble(read_uint8(file, &a), f_name, "read_uint8()");
+ uint8_t a = try_fgetc_noeof(file, f_name);
try_fclose(file, f_name);
/* Toggle windows and set active window selection. */
@@ -452,7 +452,7 @@ extern void save_win_configs()
if (0 != world.wmeta->active)
{
struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
- write_uint8(wc->id, file);
+ try_fputc(wc->id, file, f_name);
}
try_fclose_unlink_rename(file, path_tmp, path, f_name);
}