#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() */
#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()
/* 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);
unload_interface_conf();
load_interface_conf();
map_center();
+ world.winDB.v_screen_offset = 0;
}