X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=1df666b617f4b39413d56d66e2bd9b042aec0f32;hb=1c20e240bb704cddfa80b60dfa20863218edc6d8;hp=90d6519611a3ef8a7aaecf54c4cabe4ba8c05030;hpb=3662e86043fe642641164499f0aa5c256ed393d6;p=plomrogue

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 90d6519..1df666b 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -2,13 +2,13 @@
 
 #include "draw_wins.h"
 #include <ncurses.h> /* attri_t, chtype */
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t, int16_t */
 #include <stdio.h> /* for sprintf() */
 #include <stdlib.h> /* free() */
 #include <string.h> /* strlen(), strtok() */
-#include "../common/try_malloc.h" /* for try_malloc() */
-#include "command_db.h" /* for get_command_longdsc */
-#include "keybindings.h" /* struct KeyBinding, get_name_to_keycode() */
+#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 */
 #include "world.h" /* global world */
@@ -236,11 +236,11 @@ 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_name_to_keycode(kb_p->key);
-    char * cmd_dsc = get_command_longdsc(kb_p->name);
-    uint16_t size = 9 + 1 + strlen(cmd_dsc) + 1;
+    char * keyname = get_keyname_to_keycode(kb_p->key);
+    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;