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

Refactor Pearl's mark_in_direction, and invert a parameter.

Browse Source
This commit is contained in:
Jonas Kölker
2015-09-22 11:19:53 +02:00
committed by Simon Tatham
parent 8e35087e09
commit d64a79e2b8
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pearl.c
View File

@ -1963,23 +1963,20 @@ static void interpret_ui_drag(const game_state *state, const game_ui *ui,
} }
static char *mark_in_direction(const game_state *state, int x, int y, int dir, static char *mark_in_direction(const game_state *state, int x, int y, int dir,
int ismark, char *buf) int primary, char *buf)
{ {
int w = state->shared->w /*, h = state->shared->h, sz = state->shared->sz */; int w = state->shared->w /*, h = state->shared->h, sz = state->shared->sz */;
int x2 = x + DX(dir); int x2 = x + DX(dir);
int y2 = y + DY(dir); int y2 = y + DY(dir);
int dir2 = F(dir); int dir2 = F(dir);
char ch = ismark ? 'M' : 'F';
char ch = primary ? 'F' : 'M', *other;
if (!INGRID(state, x, y) || !INGRID(state, x2, y2)) return ""; if (!INGRID(state, x, y) || !INGRID(state, x2, y2)) return "";
/* disallow laying a mark over a line, or vice versa. */ /* disallow laying a mark over a line, or vice versa. */
if (ismark) { other = primary ? state->marks : state->lines;
if ((state->lines[y*w+x] & dir) || (state->lines[y2*w+x2] & dir2)) if (other[y*w+x] & dir || other[y2*w+x2] & dir2) return "";
return "";
} else {
if ((state->marks[y*w+x] & dir) || (state->marks[y2*w+x2] & dir2))
return "";
}
sprintf(buf, "%c%d,%d,%d;%c%d,%d,%d", ch, dir, x, y, ch, dir2, x2, y2); sprintf(buf, "%c%d,%d,%d;%c%d,%d,%d", ch, dir, x, y, ch, dir2, x2, y2);
return dupstr(buf); return dupstr(buf);
@ -2030,8 +2027,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
if (ui->ndragcoords > 0) return NULL; if (ui->ndragcoords > 0) return NULL;
ui->ndragcoords = -1; ui->ndragcoords = -1;
return mark_in_direction(state, ui->curx, ui->cury, return mark_in_direction(state, ui->curx, ui->cury,
KEY_DIRECTION(button & ~MOD_MASK), KEY_DIRECTION(button), control, tmpbuf);
(button & MOD_SHFT), tmpbuf);
} else { } else {
move_cursor(button, &ui->curx, &ui->cury, w, h, FALSE); move_cursor(button, &ui->curx, &ui->cury, w, h, FALSE);
if (ui->ndragcoords >= 0) if (ui->ndragcoords >= 0)
@ -2124,7 +2120,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
direction = (x < cx) ? L : R; direction = (x < cx) ? L : R;
} }
return mark_in_direction(state, gx, gy, direction, return mark_in_direction(state, gx, gy, direction,
(button == RIGHT_RELEASE), tmpbuf); (button == LEFT_RELEASE), tmpbuf);
} }
} }
} }