X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fdraw_wins.c;h=1df666b617f4b39413d56d66e2bd9b042aec0f32;hb=96ec154837699bd8687d1067deec4f6e593d99c9;hp=1ad1ab2e20d0918723e3553da5f8d63469ac7577;hpb=c53b1488c5a53e8b12cb3a631763f98010420690;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 1ad1ab2..1df666b 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -2,12 +2,12 @@ #include "draw_wins.h" #include /* attri_t, chtype */ +#include /* NULL */ #include /* uint8_t, uint16_t, uint32_t, int16_t */ #include /* for sprintf() */ #include /* free() */ #include /* strlen(), strtok() */ -#include "../common/try_malloc.h" /* for try_malloc() */ -#include "command_db.h" /* get_command_data() */ +#include "../common/try_malloc.h" /* try_malloc() */ #include "keybindings.h" /* struct KeyBinding, get_keyname_to_keycode() */ #include "wincontrol.h" /* struct WinConf, get_winconf_by_win() */ #include "windows.h" /* struct Win */ @@ -237,11 +237,10 @@ static char * get_kb_line_and_iterate(struct KeyBinding ** kb_pp) char * f_name = "get_kb_line_and_iterate()"; struct KeyBinding * kb_p = * kb_pp; char * keyname = get_keyname_to_keycode(kb_p->key); - struct Command * command_data = get_command_data(kb_p->command); - char * cmd_dsc = command_data->dsc_long; - uint16_t size = 9 + 1 + strlen(cmd_dsc) + 1; + struct Command * command = get_command_to_keycode(kb_p, kb_p->key); + uint16_t size = 9 + 1 + strlen(command->dsc_long) + 1; char * line = try_malloc(size, f_name); - sprintf(line, "%-9s %s", keyname, cmd_dsc); + sprintf(line, "%-9s %s", keyname, command->dsc_long); free(keyname); * kb_pp = kb_p->next; return line;