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

Distinguish MOVE_UNUSED from MOVE_NO_EFFECT in Bridges

Browse Source
This commit is contained in:
Ben Harris
2023-06-11 20:13:10 +01:00
parent 19b3bfc0d3
commit 1a316f47ad
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bridges.c
View File

@ -2371,7 +2371,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
button &= ~MOD_MASK; button &= ~MOD_MASK;
if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
if (!INGRID(state, gx, gy)) return NULL; if (!INGRID(state, gx, gy)) return MOVE_UNUSED;
ui->cur_visible = false; ui->cur_visible = false;
if (ggrid & G_ISLAND) { if (ggrid & G_ISLAND) {
ui->dragx_src = gx; ui->dragx_src = gx;
@ -2401,8 +2401,8 @@ static char *interpret_move(const game_state *state, game_ui *ui,
return ui_cancel_drag(ui); return ui_cancel_drag(ui);
} }
ui_cancel_drag(ui); ui_cancel_drag(ui);
if (!INGRID(state, gx, gy)) return NULL; if (!INGRID(state, gx, gy)) return MOVE_UNUSED;
if (!(GRID(state, gx, gy) & G_ISLAND)) return NULL; if (!(GRID(state, gx, gy) & G_ISLAND)) return MOVE_NO_EFFECT;
sprintf(buf, "M%d,%d", gx, gy); sprintf(buf, "M%d,%d", gx, gy);
return dupstr(buf); return dupstr(buf);
} }
@ -2425,7 +2425,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
move_cursor(button, &nx, &ny, state->w, state->h, false); move_cursor(button, &nx, &ny, state->w, state->h, false);
if (nx == ui->cur_x && ny == ui->cur_y) if (nx == ui->cur_x && ny == ui->cur_y)
return NULL; return MOVE_NO_EFFECT;
update_drag_dst(state, ui, ds, update_drag_dst(state, ui, ds,
COORD(nx)+TILE_SIZE/2, COORD(nx)+TILE_SIZE/2,
COORD(ny)+TILE_SIZE/2); COORD(ny)+TILE_SIZE/2);
@ -2553,13 +2553,13 @@ found:
ui->cur_y = best_y; ui->cur_y = best_y;
return MOVE_UI_UPDATE; return MOVE_UI_UPDATE;
} else } else
return NULL; return MOVE_NO_EFFECT;
} else if (button == 'g' || button == 'G') { } else if (button == 'g' || button == 'G') {
ui->show_hints = !ui->show_hints; ui->show_hints = !ui->show_hints;
return MOVE_UI_UPDATE; return MOVE_UI_UPDATE;
} }
return NULL; return MOVE_UNUSED;
} }
static game_state *execute_move(const game_state *state, const char *move) static game_state *execute_move(const game_state *state, const char *move)