Add game_text_format to Tents.

Replaces an inactive stub implementation.
This commit is contained in:
Jonas Kölker
2015-09-21 17:14:55 +02:00
committed by Simon Tatham
parent 051ab1701e
commit 9e1a7d87cd

75
tents.c
View File

@ -1367,42 +1367,57 @@ static char *solve_game(const game_state *state, const game_state *currstate,
static int game_can_format_as_text_now(const game_params *params) static int game_can_format_as_text_now(const game_params *params)
{ {
return TRUE; return params->w <= 1998 && params->h <= 1998; /* 999 tents */
} }
static char *game_text_format(const game_state *state) static char *game_text_format(const game_state *state)
{ {
int w = state->p.w, h = state->p.h; int w = state->p.w, h = state->p.h, r, c;
char *ret, *p; int cw = 4, ch = 2, gw = (w+1)*cw + 2, gh = (h+1)*ch + 1, len = gw * gh;
int x, y; char *board = snewn(len + 1, char);
/* sprintf(board, "%*s\n", len - 2, "");
* FIXME: We currently do not print the numbers round the edges for (r = 0; r <= h; ++r) {
* of the grid. I need to work out a sensible way of doing this for (c = 0; c <= w; ++c) {
* even when the column numbers exceed 9. int cell = r*ch*gw + cw*c, center = cell + gw*ch/2 + cw/2;
* int i = r*w + c, n = 1000;
* In the absence of those numbers, the result size is h lines
* of w+1 characters each, plus a NUL. if (r == h && c == w) /* NOP */;
* else if (c == w) n = state->numbers->numbers[w + r];
* This function is currently only used by the standalone else if (r == h) n = state->numbers->numbers[c];
* solver; until I make it look more sensible, I won't enable else switch (state->grid[i]) {
* it in the main game structure. case BLANK: board[center] = '.'; break;
*/ case TREE: board[center] = 'T'; break;
ret = snewn(h*(w+1) + 1, char); case TENT: memcpy(board + center - 1, "//\\", 3); break;
p = ret; case NONTENT: break;
for (y = 0; y < h; y++) { default: memcpy(board + center - 1, "wtf", 3);
for (x = 0; x < w; x++) { }
*p = (state->grid[y*w+x] == BLANK ? '.' :
state->grid[y*w+x] == TREE ? 'T' : if (n < 100) {
state->grid[y*w+x] == TENT ? '*' : board[center] = '0' + n % 10;
state->grid[y*w+x] == NONTENT ? '-' : '?'); if (n >= 10) board[center - 1] = '0' + n / 10;
p++; } else if (n < 1000) {
board[center + 1] = '0' + n % 10;
board[center] = '0' + n / 10 % 10;
board[center - 1] = '0' + n / 100;
}
board[cell] = '+';
memset(board + cell + 1, '-', cw - 1);
for (i = 1; i < ch; ++i) board[cell + i*gw] = '|';
} }
*p++ = '\n';
}
*p++ = '\0';
return ret; for (c = 0; c < ch; ++c) {
board[(r*ch+c)*gw + gw - 2] =
c == 0 ? '+' : r < h ? '|' : ' ';
board[(r*ch+c)*gw + gw - 1] = '\n';
}
}
memset(board + len - gw, '-', gw - 2 - cw);
for (c = 0; c <= w; ++c) board[len - gw + cw*c] = '+';
return board;
} }
struct game_ui { struct game_ui {
@ -2588,7 +2603,7 @@ const struct game thegame = {
dup_game, dup_game,
free_game, free_game,
TRUE, solve_game, TRUE, solve_game,
FALSE, game_can_format_as_text_now, game_text_format, TRUE, game_can_format_as_text_now, game_text_format,
new_ui, new_ui,
free_ui, free_ui,
encode_ui, encode_ui,