From: Simon Tatham <anakin@pobox.com>
Date: Mon, 23 Jan 2012 18:56:04 +0000 (+0000)
Subject: Fix default parameter assignment in Light Up when validating an
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5c972e9ebf009a3d03b86fb8434035c0a85f73aa;p=sgt-puzzles.git

Fix default parameter assignment in Light Up when validating an
incomplete parameter string: if the user hand-types a game ID along
the lines of '18x10:stuff', we should not assume SYMM_ROT4 in the
resulting game_params, since it'll be failed by validate_params.

[originally from svn r9386]
---

diff --git a/lightup.c b/lightup.c
index 5fe95b0..3747ec1 100644
--- a/lightup.c
+++ b/lightup.c
@@ -215,6 +215,11 @@ static void decode_params(game_params *params, char const *string)
     if (*string == 's') {
         string++;
         EATNUM(params->symm);
+    } else {
+        /* cope with user input such as '18x10' by ensuring symmetry
+         * is not selected by default to be incompatible with dimensions */
+        if (params->symm == SYMM_ROT4 && params->w != params->h)
+            params->symm = SYMM_ROT2;
     }
     params->difficulty = 0;
     /* cope with old params */