X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdraw_wins.c;h=cb640f0ed45c867a10e01f1138f67552b3634264;hb=b392e7b60ee954f1a8476d2cd2d92538b1873b2f;hp=02b569cf1457eba6b78ad140b0ddc548b1455dd9;hpb=f74f720e631840566200e8f022b1068e6f3453fb;p=plomrogue diff --git a/src/draw_wins.c b/src/draw_wins.c index 02b569c..cb640f0 100644 --- a/src/draw_wins.c +++ b/src/draw_wins.c @@ -207,10 +207,18 @@ extern void draw_map_win(struct Win * win) extern void draw_info_win(struct Win * win) { struct World * world = (struct World *) win->data; - char text[100]; - snprintf(text, 100, - "Turn: %d\nHitpoints: %d", world->turn, world->player->hitpoints); + char * dsc_turn = "Turn: "; + char * dsc_hitpoints = "\nHitpoints: "; + char * dsc_score = "\nScore: "; + uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score) + + 10 + 5 + 10; /* max strlens of numbers to be used */ + char * text = malloc(maxl + 1); + sprintf(text, "%s%d%s%d%s%d", + dsc_turn, world->turn, + dsc_hitpoints, world->player->hitpoints, + dsc_score, world->score); draw_with_linebreaks(win, text, 0); + free(text); } @@ -223,13 +231,14 @@ extern void draw_keys_win(struct Win * win) win->frame.size.y - 1); uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */ char * keydesc = malloc(keydescwidth), * keyname; + char * err_hint = "Trouble with draw_scroll_hint() in draw_keys_win()."; attr_t attri; for (y = 0; y <= world->keyswindata->max && y < win->frame.size.y; y++) { if (0 == y && offset > 0) { exit_err(draw_scroll_hint(&win->frame, y, offset + 1, '^'), - world, NULL); + world, err_hint); continue; } else if (win->frame.size.y == y + 1 @@ -239,7 +248,7 @@ extern void draw_keys_win(struct Win * win) exit_err(draw_scroll_hint(&win->frame, y, world->keyswindata->max - (offset + win->frame.size.y) + 2, 'v'), - world, NULL); + world, err_hint); continue; } attri = 0;