always got a flip animation even when it wasn't one of the ones
being turned, and a square with no effect at all was still counting
as a move.
Since it's an invariant of Flip's internal generator that every
square includes itself as an effect, this never comes up in auto-
generated games.
git-svn-id: svn://svn.tartarus.org/sgt/puzzles@6384
cda61777-01e9-0310-a592-
d414129be87e
static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
int x, int y, int button)
{
static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
int x, int y, int button)
{
- int w = state->w, h = state->h /*, wh = w * h */;
+ int w = state->w, h = state->h, wh = w * h;
char buf[80], *nullret = NULL;
if (button == LEFT_BUTTON || button == CURSOR_SELECT ||
char buf[80], *nullret = NULL;
if (button == LEFT_BUTTON || button == CURSOR_SELECT ||
nullret = "";
if (tx >= 0 && tx < w && ty >= 0 && ty < h) {
nullret = "";
if (tx >= 0 && tx < w && ty >= 0 && ty < h) {
- sprintf(buf, "M%d,%d", tx, ty);
- return dupstr(buf);
+ /*
+ * It's just possible that a manually entered game ID
+ * will have at least one square do nothing whatsoever.
+ * If so, we avoid encoding a move at all.
+ */
+ int i = ty*w+tx, j, makemove = FALSE;
+ for (j = 0; j < wh; j++) {
+ if (state->matrix->matrix[i*wh+j])
+ makemove = TRUE;
+ }
+ if (makemove) {
+ sprintf(buf, "M%d,%d", tx, ty);
+ return dupstr(buf);
+ } else {
+ return NULL;
+ }
}
}
else if (button == CURSOR_UP || button == CURSOR_DOWN ||
}
}
else if (button == CURSOR_UP || button == CURSOR_DOWN ||
int fx, fy, fd;
int v = state->grid[i];
int vv;
int fx, fy, fd;
int v = state->grid[i];
int vv;
+ int hintmask = (state->hints_active ? ~0 : ~2);
if (flashframe >= 0) {
fx = (w+1)/2 - min(x+1, w-x);
if (flashframe >= 0) {
fx = (w+1)/2 - min(x+1, w-x);
- if (!state->hints_active)
- v &= ~2;
if (ui->cdraw && ui->cx == x && ui->cy == y)
v |= 4;
if (ui->cdraw && ui->cx == x && ui->cy == y)
v |= 4;
- if (oldstate && state->grid[i] != oldstate->grid[i])
+ if (oldstate && ((state->grid[i] ^ oldstate->grid[i]) & hintmask))
vv = 255; /* means `animated' */
else
vv = v;
vv = 255; /* means `animated' */
else
vv = v;