X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fkeybindings.c;h=3ce0e440b2d319af9ff0b81d1040bc468518c10f;hb=e505542d10413b5cf94edda90bdc793a48db9385;hp=f33b559407fe419e8ab18e1bb292731cddf27416;hpb=f24abb49cab88fe55d0da6db152634f7e1a4faf0;p=plomrogue
diff --git a/src/keybindings.c b/src/keybindings.c
index f33b559..3ce0e44 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -10,14 +10,16 @@
#include "windows.h" /* for draw_all_wins() and WinMeta struct */
#include "misc.h" /* for texfile_sizes() */
#include "main.h" /* for World struct */
+#include "rexit.h" /* for err_exit() */
extern void init_keybindings(struct World * world)
{
- FILE * file = fopen("keybindings", "r");
+ FILE * file = fopen("config/keybindings", "r");
uint16_t lines, linemax;
- textfile_sizes(file, &linemax, &lines);
+ char * err = "textfile_sizes() in init_keybindings() returns error.";
+ exit_err(textfile_sizes(file, &linemax, &lines), world, err);
struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
char * command = malloc(linemax);
uint16_t commcount = 0;
@@ -48,7 +50,7 @@ extern void save_keybindings(struct World * world)
struct KeysWinData * keyswindata = (struct KeysWinData *)
world->keyswindata;
struct KeyBinding * keybindings = world->keybindings;
- FILE * file = fopen("keybindings", "w");
+ FILE * file = fopen("config/keybindings", "w");
uint16_t linemax = 0;
uint16_t i;
for (i = 0; i <= keyswindata->max; i++)
@@ -169,7 +171,8 @@ extern char * get_keyname(uint16_t keycode)
extern void keyswin_mod_key(struct World * world, struct WinMeta * win_meta)
{
world->keyswindata->edit = 1;
- draw_all_wins(win_meta);
+ exit_err(draw_all_wins(win_meta), world, "Trouble with draw_all_wins() in "
+ "keyswin_mod_key().");
int key = getch();
if (key < 1000)
{