diff options
| -rw-r--r-- | signpost.c | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -422,11 +422,12 @@ static game_params *custom_params(const config_item *cfg) static char *validate_params(const game_params *params, int full) { - if (params->w < 2 || params->h < 2) - return "Width and height must both be at least two"; - if (params->w == 2 && params->h == 2) /* leads to generation hang */ - return "Width and height cannot both be two"; - + if (params->w < 1) return "Width must be at least one"; + if (params->h < 1) return "Height must be at least one"; + if (full && params->w == 1 && params->h == 1) + /* The UI doesn't let us move these from unsolved to solved, + * so we disallow generating (but not playing) them. */ + return "Width and height cannot both be one"; return NULL; } @@ -623,6 +624,7 @@ static int new_game_fill(game_state *state, random_state *rs, state->dirs[taili] = 0; nfilled = 2; + assert(state->n > 1); while (nfilled < state->n) { /* Try and expand _from_ headi; keep going if there's only one @@ -638,6 +640,8 @@ static int new_game_fill(game_state *state, random_state *rs, an = cell_adj(state, headi, aidx, adir); } while (an == 1); + if (nfilled == state->n) break; + /* Try and expand _to_ taili; keep going if there's only one * place to go to. */ an = cell_adj(state, taili, aidx, adir); @@ -801,6 +805,9 @@ static char *new_game_desc(const game_params *params, random_state *rs, char *ret; int headi, taili; + /* this shouldn't happen (validate_params), but let's play it safe */ + if (params->w == 1 && params->h == 1) return dupstr("1a"); + generate: blank_game_into(state); |