- 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";