X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=9857af522565dee13086b9deeaa3250c7065a826;hb=3fb2cb493ae564f8b14ddb4143b6c1f5bf16f16a;hp=d45bb1e78adcb889ee4ee82ed137d24ab5a8bde7;hpb=c1c88f66166ed26d0bd346570c37f006e3c8364b;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index d45bb1e..9857af5 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -354,13 +354,15 @@ extern void draw_win_log(struct Win * win) return; } uint32_t x, i, n_postbreak_lines; - for (i = 0, x = 0, n_postbreak_lines = 0; i < strlen(world.log); i++) + for (i = 0, x = 0, n_postbreak_lines = 1; i < strlen(world.log); i++) { exit_err(i == UINT32_MAX, "Log too large."); x++; - n_postbreak_lines = n_postbreak_lines + (x == win->frame_size.x); - n_postbreak_lines = n_postbreak_lines + ('\n' == world.log[i]); - x = ((x == win->frame_size.x) || ('\n' == world.log[i])) ? 0 : x; + if (x > win->frame_size.x || '\n' == world.log[i]) + { + n_postbreak_lines++; + x = 0; + } } if (n_postbreak_lines > win->frame_size.y) { @@ -424,10 +426,13 @@ extern void draw_win_info(struct Win * win) { char * dsc_turn = "Turn: "; char * dsc_hitpoints = "\nHitpoints: "; - uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3; + char * dsc_satiation = "\nSatiation: "; + uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + + strlen(dsc_satiation) + 6 + 3; char * text = try_malloc(maxl + 1, __func__); - int test = sprintf(text, "%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, - world.player_lifepoints); + int test = sprintf(text, "%s%d%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, + world.player_lifepoints, dsc_satiation, + world.player_satiation); exit_trouble(test < 0, __func__, "sprintf"); add_text_with_linebreaks(win, text); free(text);