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

Map: add user preference to draw larger stipple marks.

Browse Source 
This is useful on smaller screens, where the default-size pencil marks may
be too small to be visible by default.
This commit is contained in:
Franklin Wei
2024-07-21 19:26:13 -04:00
committed by Simon Tatham
parent 6b453e4e98
commit 72ff127404
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
map.c
View File

@ -2283,6 +2283,7 @@ struct game_ui {
int drag_pencil; int drag_pencil;
int dragx, dragy; int dragx, dragy;
bool show_numbers; bool show_numbers;
bool large_stipples;
int cur_x, cur_y, cur_lastmove; int cur_x, cur_y, cur_lastmove;
bool cur_visible, cur_moved; bool cur_visible, cur_moved;
@ -2329,6 +2330,7 @@ static game_ui *new_ui(const game_state *state)
ui->cur_moved = false; ui->cur_moved = false;
ui->cur_lastmove = 0; ui->cur_lastmove = 0;
ui->flash_type = FLASH_CYCLIC; ui->flash_type = FLASH_CYCLIC;
ui->large_stipples = false;
legacy_prefs_override(ui); legacy_prefs_override(ui);
return ui; return ui;
} }
@ -2337,7 +2339,7 @@ static config_item *get_prefs(game_ui *ui)
{ {
config_item *ret; config_item *ret;
ret = snewn(3, config_item); ret = snewn(4, config_item);
ret[0].name = "Victory flash effect"; ret[0].name = "Victory flash effect";
ret[0].kw = "flash-type"; ret[0].kw = "flash-type";
@ -2351,8 +2353,15 @@ static config_item *get_prefs(game_ui *ui)
ret[1].type = C_BOOLEAN; ret[1].type = C_BOOLEAN;
ret[1].u.boolean.bval = ui->show_numbers; ret[1].u.boolean.bval = ui->show_numbers;
ret[2].name = NULL; ret[2].name = "Display style for stipple marks";
ret[2].type = C_END; ret[2].kw = "stipple-style";
ret[2].type = C_CHOICES;
ret[2].u.choices.choicenames = ":Small:Large";
ret[2].u.choices.choicekws = ":small:large";
ret[2].u.choices.selected = ui->large_stipples;
ret[3].name = NULL;
ret[3].type = C_END;
return ret; return ret;
} }
@ -2361,6 +2370,7 @@ static void set_prefs(game_ui *ui, const config_item *cfg)
{ {
ui->flash_type = cfg[0].u.choices.selected; ui->flash_type = cfg[0].u.choices.selected;
ui->show_numbers = cfg[1].u.boolean.bval; ui->show_numbers = cfg[1].u.boolean.bval;
ui->large_stipples = cfg[2].u.choices.selected;
} }
static void free_ui(game_ui *ui) static void free_ui(game_ui *ui)
@ -2809,7 +2819,7 @@ static void draw_error(drawing *dr, game_drawstate *ds, int x, int y)
static void draw_square(drawing *dr, game_drawstate *ds, static void draw_square(drawing *dr, game_drawstate *ds,
const game_params *params, struct map *map, const game_params *params, struct map *map,
int x, int y, unsigned long v) int x, int y, unsigned long v, bool large_stipples)
{ {
int w = params->w, h = params->h, wh = w*h; int w = params->w, h = params->h, wh = w*h;
int tv, bv, xo, yo, i, j, oldj; int tv, bv, xo, yo, i, j, oldj;
@ -2882,7 +2892,8 @@ static void draw_square(drawing *dr, game_drawstate *ds,
draw_circle(dr, COORD(x) + (xo+1)*TILESIZE/5, draw_circle(dr, COORD(x) + (xo+1)*TILESIZE/5,
COORD(y) + (yo+1)*TILESIZE/5, COORD(y) + (yo+1)*TILESIZE/5,
TILESIZE/7, COL_0 + c, COL_0 + c); large_stipples ? TILESIZE/4 : TILESIZE/7,
COL_0 + c, COL_0 + c);
} }
/* /*
@ -3064,7 +3075,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
unsigned long v = ds->todraw[y*w+x]; unsigned long v = ds->todraw[y*w+x];
if (ds->drawn[y*w+x] != v) { if (ds->drawn[y*w+x] != v) {
draw_square(dr, ds, &state->p, state->map, x, y, v); draw_square(dr, ds, &state->p, state->map, x, y, v, ui->large_stipples);
ds->drawn[y*w+x] = v; ds->drawn[y*w+x] = v;
} }
} }