X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=59b7c3aa444bb62642dc946737ce74bec0d3740a;hb=65d60eba28c8e3128e1603e577c1436a2182f6bd;hp=9fd78fc9088fdc1b419256dd10910bbca77b5513;hpb=024b404c0db59dc6651b1c8f3d379c2797654fdf;p=plomrogue
diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 9fd78fc..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);
@@ -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.score);
+ sprintf(text, "%s%d%s%d",
+ dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints);
add_text_with_linebreaks(win, text);
}
@@ -358,12 +354,12 @@ extern void draw_win_inventory(struct Win * win)
win->center.y = world.player_inventory_select;
char inventory_copy[strlen(world.player_inventory) + 1];
sprintf(inventory_copy, "%s", world.player_inventory);
- char * foo = inventory_copy;
+ char * strtok_target = inventory_copy;
uint8_t i = 0;
while (1)
{
- char * object = strtok(foo, "\n");
- foo = NULL;
+ char * object = strtok(strtok_target, "\n");
+ strtok_target = NULL;
if (NULL == object)
{
return;
@@ -384,7 +380,7 @@ extern void draw_win_available_keybindings(struct Win * win)
{
char * title = "Active window's keybindings:";
struct KeyBinding * kb_p;
- struct Win * w = get_win_by_id(world.windb.active);
+ struct Win * w = get_win_by_id(world.winDB.active);
if (0 == w->view)
{
kb_p = w->kb.kbs;