X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=59b7c3aa444bb62642dc946737ce74bec0d3740a;hb=65d60eba28c8e3128e1603e577c1436a2182f6bd;hp=f10e9cb80a20d50d15c9a49a0b1312baa7879379;hpb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index f10e9cb..59b7c3a 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -235,8 +235,8 @@ 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 = get_command_to_keycode(kb_p, kb_p->key); + char * keyname = get_keyname_to_keycode(kb_p->keycode); + struct Command * command = get_command_to_keycode(kb_p, kb_p->keycode); uint16_t size = 9 + 1 + strlen(command->dsc_long) + 1; char * line = try_malloc(size, f_name); sprintf(line, "%-9s %s", keyname, command->dsc_long); @@ -323,7 +323,7 @@ extern void draw_win_map(struct Win * win) { try_resize_winmap(win, world.map.size.y, world.map.size.x); uint16_t z = 0; - uint8_t x, y; + uint16_t x, y; for (y = 0; y < world.map.size.y; y++) { for (x = 0; x < world.map.size.x; x++) @@ -340,14 +340,10 @@ extern void draw_win_info(struct Win * win) { char * dsc_turn = "Turn: "; char * dsc_hitpoints = "\nHitpoints: "; - char * dsc_score = "\nScore: "; - uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score) - + 5 + 3 + 5; /* Max strlens of strings of numbers to use. */ + uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3; char text[maxl + 1]; - sprintf(text, "%s%d%s%d%s%d", - dsc_turn, world.turn, - dsc_hitpoints, world.player_lifepoints, - dsc_score, world.player_score); + sprintf(text, "%s%d%s%d", + dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints); add_text_with_linebreaks(win, text); }