X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=9857af522565dee13086b9deeaa3250c7065a826;hb=ea9b56e85af64ae816c5faea045ffdd004d56472;hp=c0d3d8ae4a29d2615f7439a87e52e064879a3a8f;hpb=6e1a472e34a2ca5a18211a65a59123dc9c12bc88;p=plomrogue
diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index c0d3d8a..9857af5 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -338,7 +338,7 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
uint8_t size = strlen(p0) + strlen(p1) + strlen(p2) + strlen(sep)
+ strlen(p4) + strlen(sep) + strlen(p6) +strlen(value_prefix)
+ strlen(p8) + strlen(p9) + strlen(p10) + strlen(p11)
- + strlen(newlines);
+ + strlen(newlines) + 1;
char * msg = try_malloc(size, __func__);
sprintf(msg, "%s%s%s%s%s%s%s%s%s%s%s%s%s", p0, p1, p2, sep, p4, sep, p6,
value_prefix, p8, p9, p10, p11, newlines);
@@ -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);