Robustness in the face of a completely configurable expansion factor.

[originally from svn r4464]

diff --git a/rect.c b/rect.c
index ab48e3c5292b7286f7b7a0d7ba4b4a1b70a9ff7a..4e5d92a35e7e01edd549373e7acd840a28061908 100644 (file)
--- a/rect.c
+++ b/rect.c
@@ -403,9 +403,9 @@ char *new_game_seed(game_params *params, random_state *rs)
      * generate the base grid.
      */
     params2->w = params->w / (1.0F + params->expandfactor);
-    if (params2->w < 1) params2->w = 1;
-    params2->h = params->h * (1.0F + params->expandfactor);
-    if (params2->h < 1) params2->h = 1;
+    if (params2->w < 2 && params->w >= 2) params2->w = 2;
+    params2->h = params->h / (1.0F + params->expandfactor);
+    if (params2->h < 2 && params->h >= 2) params2->h = 2;
 
     grid = snewn(params2->w * params2->h, int);