X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmisc.c;h=fcb53ecf1e6f4423c89ebeeb64cbe6a74578c568;hb=eb96a1dfe83cef7f3d1c0c73e03b915caca09db8;hp=17a12da5d697f62059f9f37ce8768ac3d4d97ae7;hpb=6f98f0b029c3e84f1df0f2f3642f88e91b17cf33;p=plomrogue

diff --git a/src/client/misc.c b/src/client/misc.c
index 17a12da..fcb53ec 100644
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -2,14 +2,13 @@
 
 #include "misc.h"
 #include <ncurses.h> /* delwin() */
-#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint32_t */
 #include <stdio.h> /* FILE, sprintf() */
 #include <stdlib.h> /* free(), exit() */
 #include <string.h> /* memcpy(), strlen() */
 #include <unistd.h> /* global optarg, getopt() */
 #include "../common/err_try_fgets.h" /* reset_err_try_fgets_counter() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
+#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_width(),
                                   * try_fclose_unlink_rename(),
                                   */
 #include "../common/rexit.h" /* exit_err() */
@@ -18,7 +17,7 @@
 #include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(),
                           * write_keybindings_to_file()
                           */
-#include "map_window.h" /* map_center() */
+#include "map.h" /* map_center() */
 #include "windows.h" /* free_winDB(), make_v_screen_and_init_win_sizes(),
                       * read_winconf_from_file(), write_winconf_of_id_to_file(),
                       * toggle_window()
@@ -73,7 +72,7 @@ extern void load_interface_conf()
     /* Read keybindings and WincConf DB from interface config file. */
     reset_err_try_fgets_counter();
     FILE * file = try_fopen(world.path_interface, "r", f_name);
-    uint32_t linemax = textfile_sizes(file, NULL);
+    uint32_t linemax = textfile_width(file);
     char line[linemax + 1];
     read_keybindings_from_file(line, linemax, file, &world.kb_global);
     read_keybindings_from_file(line, linemax, file, &world.kb_wingeom);
@@ -129,6 +128,7 @@ extern void reload_interface_conf()
     unload_interface_conf();
     load_interface_conf();
     map_center();
+    world.winDB.v_screen_offset = 0;
 }