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;
extern void draw_win_map(struct Win * win)
{
uint16_t x, y;
- init_pair(1, COLOR_WHITE, COLOR_BLUE);
- init_pair(2, COLOR_BLUE, COLOR_BLACK);
- attr_t attr_mem = COLOR_PAIR(2);
- attr_t attr_sha = COLOR_PAIR(1);
+ init_pair(1, COLOR_WHITE, COLOR_WHITE); //
+ init_pair(2, COLOR_WHITE, COLOR_BLUE); //
+ init_pair(3, COLOR_BLUE, COLOR_WHITE); //
+ // attr_t attr_mem = COLOR_PAIR(2);
+ // attr_t attr_sha = COLOR_PAIR(1);
try_resize_winmap(win, world.map.length, world.map.length * 2 + 1);
for (y = 0; y < world.map.length; y++)
{
for (x = 0; x < world.map.length; x++)
{
- attr_t a=' '==world.mem_map[y*world.map.length+x]?attr_sha:attr_mem;
+ char c_m = world.mem_map[y * world.map.length + x]; //
+ attr_t a = COLOR_PAIR(2); //
+ if (c_m == ' ') //
+ { //
+ a = COLOR_PAIR(1); //
+ } //
+ else if (c_m == 'X' || c_m == '|') //
+ { //
+ a = COLOR_PAIR(3); //
+ } //
+ // attr_t a=' '==world.mem_map[y*world.map.length+x]?attr_sha:attr_mem;
char c = world.mem_map[y*world.map.length + x];
set_ch_on_yx(win, y, x * 2 + (y % 2), c | a);
set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a);
}
}
+ init_pair(4, COLOR_BLUE, COLOR_BLACK); //
+ init_pair(5, COLOR_YELLOW, COLOR_BLACK); //
+ init_pair(6, COLOR_RED, COLOR_WHITE); //
+ init_pair(7, COLOR_WHITE, COLOR_RED); //
+ init_pair(8, COLOR_GREEN, COLOR_BLACK); //
+ init_pair(9, COLOR_MAGENTA, COLOR_BLACK); //
+ init_pair(10, COLOR_CYAN, COLOR_BLACK); //
+ init_pair(11, COLOR_BLACK, COLOR_GREEN); //
+ init_pair(12, COLOR_BLACK, COLOR_MAGENTA); //
+ init_pair(13, COLOR_WHITE, COLOR_BLACK); //
+ init_pair(14, COLOR_RED, COLOR_BLACK); //
for (y = 0; y < world.map.length; y++)
{
for (x = 0; x < world.map.length; x++)
{
- if (' ' != world.map.cells[y*world.map.length + x])
+ char c = world.map.cells[y*world.map.length + x]; //
+ if (' ' != c) //
+ // if (' ' != world.map.cells[y*world.map.length + x])
{
- char c = world.map.cells[y*world.map.length + x];
- set_ch_on_yx(win, y, x * 2 + (y % 2), c);
- set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ');
+ attr_t a = COLOR_PAIR(4); //
+ if ('.' == c || ':' == c) //
+ { //
+ a = COLOR_PAIR(5); //
+ } //
+ else if ('@' == c) //
+ { //
+ a = COLOR_PAIR(6); //
+ } //
+ else if ('a' == c || 'd' == c || 'b' == c) //
+ { //
+ a = COLOR_PAIR(7); //
+ } //
+ else if ('#' == c) //
+ { //
+ a = COLOR_PAIR(8); //
+ } //
+ else if ('$' == c) //
+ { //
+ a = COLOR_PAIR(9); //
+ } //
+ else if ('m' == c || '/' == c || '-' == c) //
+ { //
+ a = COLOR_PAIR(10); //
+ } //
+ else if ('X' == c || '|' == c) //
+ { //
+ a = COLOR_PAIR(11); //
+ } //
+ else if ('_' == c) //
+ { //
+ a = COLOR_PAIR(12); //
+ } //
+ else if ('%' == c || '*' == c) //
+ { //
+ a = COLOR_PAIR(13); //
+ } //
+ else if ('=' == c) //
+ { //
+ a = COLOR_PAIR(14); //
+ } //
+ // char c = world.map.cells[y*world.map.length + x];
+ set_ch_on_yx(win, y, x * 2 + (y % 2), c | a); //
+ set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); //
+ // set_ch_on_yx(win, y, x * 2 + (y % 2), c);
+ // set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ');
}
}
}
char c = world.map.cells[y * world.map.length + x];
c = ' ' == c ? world.mem_map[y * world.map.length + x] : c;
set_ch_on_yx(win, y, x * 2 + (y % 2), c | A_REVERSE);
- set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | A_REVERSE);
+ set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, '?' | A_REVERSE);
}
}
{
char * dsc_turn = "Turn: ";
char * dsc_hitpoints = "\nHitpoints: ";
- uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3;
+ char * dsc_satiation = "\nSatiation: ";
+ char * dsc_godsmood = "\nGod's mood: "; // 7DRL
+ char * dsc_godsfavor = "\nGod's favor: "; // 7DRL
+ uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3 //
+ + strlen(dsc_satiation) + 6 + strlen(dsc_godsmood) + 6 //
+ + strlen(dsc_godsfavor) + 6; //
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%s%d%s%d", dsc_turn, world.turn,
+ dsc_hitpoints, world.player_lifepoints, dsc_satiation,
+ world.player_satiation, dsc_godsmood, world.godsmood, //
+ dsc_godsfavor, world.godsfavor); //
exit_trouble(test < 0, __func__, "sprintf");
add_text_with_linebreaks(win, text);
free(text);
char * wait_response = "(polling)";
char * text = world.things_here ? world.things_here : wait_response;
add_text_with_linebreaks(win, text);
+ win->center.y = world.things_here_scroll + (win->frame_size.y / 2); //
}
projects / plomrogue / blobdiff