zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use a dynamically-sized buffer for Pattern row clues

Browse Source
This commit is contained in:
Ben Harris
2023-01-02 17:44:04 +00:00
parent d246077e78
commit a2212e82aa
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pattern.c
View File

@ -1275,6 +1275,7 @@ struct game_drawstate {
int tilesize; int tilesize;
unsigned char *visible, *numcolours; unsigned char *visible, *numcolours;
int cur_x, cur_y; int cur_x, cur_y;
char *strbuf; /* Used for formatting clues. */
}; };
static char *interpret_move(const game_state *state, game_ui *ui, static char *interpret_move(const game_state *state, game_ui *ui,
@ -1720,6 +1721,8 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
ds->numcolours = snewn(ds->w + ds->h, unsigned char); ds->numcolours = snewn(ds->w + ds->h, unsigned char);
memset(ds->numcolours, 255, ds->w + ds->h); memset(ds->numcolours, 255, ds->w + ds->h);
ds->cur_x = ds->cur_y = 0; ds->cur_x = ds->cur_y = 0;
ds->strbuf = snewn(state->common->rowsize *
MAX_DIGITS(*state->common->rowdata) + 1, char);
return ds; return ds;
} }
@ -1727,6 +1730,7 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
static void game_free_drawstate(drawing *dr, game_drawstate *ds) static void game_free_drawstate(drawing *dr, game_drawstate *ds)
{ {
sfree(ds->visible); sfree(ds->visible);
sfree(ds->strbuf);
sfree(ds); sfree(ds);
} }
@ -1823,7 +1827,7 @@ static void draw_numbers(
if (i < state->common->w) { if (i < state->common->w) {
for (j = 0; j < rowlen; j++) { for (j = 0; j < rowlen; j++) {
int x, y; int x, y;
char str[80]; char str[MAX_DIGITS(*rowdata) + 1];
x = rx; x = rx;
y = BORDER + TILE_SIZE * (TLBORDER(state->common->h)-1); y = BORDER + TILE_SIZE * (TLBORDER(state->common->h)-1);
@ -1834,17 +1838,15 @@ static void draw_numbers(
} }
} else { } else {
int x, y; int x, y;
char str[280];
size_t off = 0; size_t off = 0;
for (j = 0; j < rowlen; j++) { assert(rowlen <= state->common->rowsize);
assert(off < 260); for (j = 0; j < rowlen; j++)
off += sprintf(str + off, "%s%d", j ? " " : "", rowdata[j]); off += sprintf(ds->strbuf + off, "%s%d", j ? " " : "", rowdata[j]);
}
y = ry; y = ry;
x = BORDER + TILE_SIZE * (TLBORDER(state->common->w)-1); x = BORDER + TILE_SIZE * (TLBORDER(state->common->w)-1);
draw_text(dr, x+TILE_SIZE, y+TILE_SIZE/2, FONT_VARIABLE, draw_text(dr, x+TILE_SIZE, y+TILE_SIZE/2, FONT_VARIABLE,
fontsize, ALIGN_HRIGHT | ALIGN_VCENTRE, colour, str); fontsize, ALIGN_HRIGHT | ALIGN_VCENTRE, colour, ds->strbuf);
} }
unclip(dr); unclip(dr);