From 11c1447eac7698f01c2a00764c2b1a900a9d6a90 Mon Sep 17 00:00:00 2001
From: Michael Quevillon <mquevill@nd.edu>
Date: Sun, 3 Apr 2022 13:02:30 -0500
Subject: [PATCH] Solo: Set max difficulty for small jigsaw puzzles

(cherry picked from Android port, commit
5c9a7b64a06d07f97a41622c4b91d81f3419a51b)
---
 solo.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solo.c b/solo.c
index a2d8a47..f6c7172 100644
--- a/solo.c
+++ b/solo.c
@@ -3654,10 +3654,11 @@ static char *new_game_desc(const game_params *params, random_state *rs,
      * the puzzle size: all 2x2 puzzles appear to be Trivial
      * (DIFF_BLOCK) so we cannot hold out for even a Basic
      * (DIFF_SIMPLE) one.
+     * Jigsaw puzzles of size 2 and 3 are also all trivial.
      */
     dlev.maxdiff = params->diff;
     dlev.maxkdiff = params->kdiff;
-    if (c == 2 && r == 2)
+    if ((c == 2 && r == 2) || (r == 1 && c < 4))
         dlev.maxdiff = DIFF_BLOCK;
 
     grid = snewn(area, digit);