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

Distinguish MOVE_UNUSED from MOVE_NO_EFFECT in Cube

Browse Source
This commit is contained in:
Ben Harris
2023-06-15 23:11:57 +01:00
parent 73e7bf73bb
commit 5fb94c9f47
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cube.c
View File

@ -1145,7 +1145,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
cy = (int)(state->grid->squares[state->current].y * GRID_SCALE) + ds->oy; cy = (int)(state->grid->squares[state->current].y * GRID_SCALE) + ds->oy;
if (x == cx && y == cy) if (x == cx && y == cy)
return NULL; /* clicked in exact centre! */ return MOVE_NO_EFFECT; /* clicked in exact centre! */
angle = atan2(y - cy, x - cx); angle = atan2(y - cy, x - cx);
/* /*
@ -1196,11 +1196,11 @@ static char *interpret_move(const game_state *state, game_ui *ui,
direction = RIGHT; direction = RIGHT;
} }
} else } else
return NULL; return MOVE_UNUSED;
mask = state->grid->squares[state->current].directions[direction]; mask = state->grid->squares[state->current].directions[direction];
if (mask == 0) if (mask == 0)
return NULL; return MOVE_NO_EFFECT;
/* /*
* Translate diagonal directions into orthogonal ones. * Translate diagonal directions into orthogonal ones.
@ -1215,14 +1215,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
} }
if (find_move_dest(state, direction, skey, dkey) < 0) if (find_move_dest(state, direction, skey, dkey) < 0)
return NULL; return MOVE_NO_EFFECT;
if (direction == LEFT) return dupstr("L"); if (direction == LEFT) return dupstr("L");
if (direction == RIGHT) return dupstr("R"); if (direction == RIGHT) return dupstr("R");
if (direction == UP) return dupstr("U"); if (direction == UP) return dupstr("U");
if (direction == DOWN) return dupstr("D"); if (direction == DOWN) return dupstr("D");
return NULL; /* should never happen */ return MOVE_NO_EFFECT; /* should never happen */
} }
static game_state *execute_move(const game_state *from, const char *move) static game_state *execute_move(const game_state *from, const char *move)