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);
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 = 1;
+ }
}
if (n_postbreak_lines > win->frame_size.y)
{
uint32_t size = n_postbreak_lines * (win->frame_size.x + 1);
win->winmap = try_malloc(sizeof(chtype) * size, __func__);
for (i = 0; i < size; win->winmap[i] = ' ', i++);
+ /* TODO: This should only be done with "long" line break style. */
do_realloc_winmap = 0;
draw_text_from_bottom(win, world.log);
do_realloc_winmap = 1;
{
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);