X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=7cdb0b5134668af19474c541fa0e39d94cb0a5e6;hb=3a5db435e5dc6422e559033fbdf9b64c8d8567c9;hp=9fd78fc9088fdc1b419256dd10910bbca77b5513;hpb=024b404c0db59dc6651b1c8f3d379c2797654fdf;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 9fd78fc..7cdb0b5 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -347,7 +347,7 @@ extern void draw_win_info(struct Win * win) sprintf(text, "%s%d%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints, - dsc_score, world.score); + dsc_score, world.player_score); add_text_with_linebreaks(win, text); } @@ -358,12 +358,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 +384,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;