X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=34f3c855da6c9d2927bfad84e73ff11fe207f4e7;hb=4278fa073915777094328bc6575cdcc1f849f9f1;hp=0e7012e15f8e0ccc07dcb0cea8ab5489d11827b6;hpb=ceac4818f8615019c072abda374d2c723fa65b78;p=plomrogue diff --git a/roguelike.c b/roguelike.c index 0e7012e..34f3c85 100644 --- a/roguelike.c +++ b/roguelike.c @@ -208,11 +208,11 @@ void draw_keys_window (struct Win * win) { struct KeyBinding * keybindings = world->keybindings; int offset = 0; if (keyswindata->max >= win->height) { - if (keyswindata->select > win->height / 2) + if (keyswindata->select > win->height / 2) { if (keyswindata->select < (keyswindata->max - (win->height / 2))) offset = keyswindata->select - (win->height / 2); else - offset = keyswindata->max - win->height + 1; } + offset = keyswindata->max - win->height + 1; } } int keydescwidth = 9 + 1; // max length assured by get_keyname() + \0 char * keydesc = malloc(keydescwidth); attr_t attri; @@ -254,15 +254,15 @@ void init_keybindings(struct World * world) { struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding)); fseek(file, 0, SEEK_SET); char * command = malloc(linemax); - char commcount = 0; + int commcount = 0; char * digits = malloc(3); - char digicount = 0; + int digicount = 0; int key, digimax; int keycount = 0; c = getc(file); while (EOF != c) { if ('\n' == c) { - keybindings[keycount].name = calloc(commcount, sizeof(char)); + keybindings[keycount].name = calloc(commcount + 1, sizeof(char)); memcpy(keybindings[keycount].name, command, commcount); keybindings[keycount].key = key; keycount++;