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

Always use ret instead of state in execute_move

Browse Source
This commit is contained in:
Kevin Lyles
2015-05-03 12:40:14 -05:00
committed by Simon Tatham
parent 7cf1e1f83e
commit 6684bec60c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
galaxies.c
View File

@ -2808,7 +2808,7 @@ static game_state *execute_move(const game_state *state, const char *move)
) { ) {
move++; move++;
if (sscanf(move, "%d,%d%n", &x, &y, &n) != 2 || if (sscanf(move, "%d,%d%n", &x, &y, &n) != 2 ||
!INUI(state, x, y)) !INUI(ret, x, y))
goto badmove; goto badmove;
sp = &SPACE(ret, x, y); sp = &SPACE(ret, x, y);
@ -2816,7 +2816,7 @@ static game_state *execute_move(const game_state *state, const char *move)
if (c == 'D' || c == 'd') { if (c == 'D' || c == 'd') {
unsigned int currf, newf, maskf; unsigned int currf, newf, maskf;
if (!dot_is_possible(state, sp, 1)) goto badmove; if (!dot_is_possible(ret, sp, 1)) goto badmove;
newf = F_DOT | (c == 'd' ? F_DOT_BLACK : 0); newf = F_DOT | (c == 'd' ? F_DOT_BLACK : 0);
currf = GRID(ret, grid, x, y).flags; currf = GRID(ret, grid, x, y).flags;
@ -2851,8 +2851,8 @@ static game_state *execute_move(const game_state *state, const char *move)
} else if (c == 'A' || c == 'a') { } else if (c == 'A' || c == 'a') {
move++; move++;
if (sscanf(move, "%d,%d,%d,%d%n", &x, &y, &ax, &ay, &n) != 4 || if (sscanf(move, "%d,%d,%d,%d%n", &x, &y, &ax, &ay, &n) != 4 ||
x < 1 || y < 1 || x >= (state->sx-1) || y >= (state->sy-1) || x < 1 || y < 1 || x >= (ret->sx-1) || y >= (ret->sy-1) ||
ax < 1 || ay < 1 || ax >= (state->sx-1) || ay >= (state->sy-1)) ax < 1 || ay < 1 || ax >= (ret->sx-1) || ay >= (ret->sy-1))
goto badmove; goto badmove;
dot = &GRID(ret, grid, ax, ay); dot = &GRID(ret, grid, ax, ay);
@ -2864,10 +2864,10 @@ static game_state *execute_move(const game_state *state, const char *move)
sp = &GRID(ret, grid, x+dx, y+dy); sp = &GRID(ret, grid, x+dx, y+dy);
if (sp->type != s_tile) continue; if (sp->type != s_tile) continue;
if (sp->flags & F_TILE_ASSOC) { if (sp->flags & F_TILE_ASSOC) {
space *dot = &SPACE(state, sp->dotx, sp->doty); space *dot = &SPACE(ret, sp->dotx, sp->doty);
if (dot->flags & F_DOT_HOLD) continue; if (dot->flags & F_DOT_HOLD) continue;
} }
add_assoc(state, sp, dot); add_assoc(ret, sp, dot);
} }
} }
move += n; move += n;