shithub: puzzles

Download patch

ref: eb1ae3f3d041f9ff0c11b04613a695be11bda706
parent: a98ac4bb428ab5c1ff665aa1def6cc14d02a4e19
author: Ben Harris <bjh21@bjh21.me.uk>
date: Sat Jan 28 13:49:47 EST 2023

Forbid moves that fill with the current colour in Flood

This avoids an assertion failure, "oldcolour != newcolour" in fill(),
by catching it it execute_move().  As far as I know this couldn't be
triggered from the UI, but it could be demonstrated with this save
file:

SAVEFILE:41:Simon Tatham's Portable Puzzle Collection
VERSION :1:1
GAME    :5:Flood
PARAMS  :1:3
CPARAMS :1:3
DESC    :12:231353400,11
NSTATES :1:3
STATEPOS:1:3
MOVE    :2:M3
MOVE    :2:M3

--- a/flood.c
+++ b/flood.c
@@ -887,6 +887,7 @@
     if (move[0] == 'M' &&
         sscanf(move+1, "%d", &c) == 1 &&
         c >= 0 &&
+        c != state->grid[FILLY * state->w + FILLX] &&
         !state->complete) {
         int *queue = snewn(state->w * state->h, int);
 	ret = dup_game(state);