X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/93b1da3d0f613d616b930419354558365847bc7d..07dfb697bb30781c963b11eb00c4951bb5db6a7d:/net.c

diff --git a/net.c b/net.c
index 5ef1ba7..fe9b846 100644
--- a/net.c
+++ b/net.c
@@ -120,7 +120,7 @@ static int xyd_cmp(const void *av, const void *bv) {
     if (a->direction > b->direction)
 	return +1;
     return 0;
-};
+}
 
 static int xyd_cmp_nc(void *av, void *bv) { return xyd_cmp(av, bv); }
 
@@ -149,32 +149,29 @@ static game_params *default_params(void)
     return ret;
 }
 
+static const struct game_params net_presets[] = {
+    {5, 5, FALSE, TRUE, 0.0},
+    {7, 7, FALSE, TRUE, 0.0},
+    {9, 9, FALSE, TRUE, 0.0},
+    {11, 11, FALSE, TRUE, 0.0},
+    {13, 11, FALSE, TRUE, 0.0},
+    {5, 5, TRUE, TRUE, 0.0},
+    {7, 7, TRUE, TRUE, 0.0},
+    {9, 9, TRUE, TRUE, 0.0},
+    {11, 11, TRUE, TRUE, 0.0},
+    {13, 11, TRUE, TRUE, 0.0},
+};
+
 static int game_fetch_preset(int i, char **name, game_params **params)
 {
     game_params *ret;
     char str[80];
-    static const struct { int x, y, wrap; } values[] = {
-        {5, 5, FALSE},
-        {7, 7, FALSE},
-        {9, 9, FALSE},
-        {11, 11, FALSE},
-        {13, 11, FALSE},
-        {5, 5, TRUE},
-        {7, 7, TRUE},
-        {9, 9, TRUE},
-        {11, 11, TRUE},
-        {13, 11, TRUE},
-    };
-
-    if (i < 0 || i >= lenof(values))
+
+    if (i < 0 || i >= lenof(net_presets))
         return FALSE;
 
     ret = snew(game_params);
-    ret->width = values[i].x;
-    ret->height = values[i].y;
-    ret->wrapping = values[i].wrap;
-    ret->unique = TRUE;
-    ret->barrier_probability = 0.0;
+    *ret = net_presets[i];
 
     sprintf(str, "%dx%d%s", ret->width, ret->height,
             ret->wrapping ? " wrapping" : "");
@@ -302,12 +299,8 @@ static game_params *custom_params(config_item *cfg)
 
 static char *validate_params(game_params *params)
 {
-    if (params->width <= 0 && params->height <= 0)
+    if (params->width <= 0 || params->height <= 0)
 	return "Width and height must both be greater than zero";
-    if (params->width <= 0)
-	return "Width must be greater than zero";
-    if (params->height <= 0)
-	return "Height must be greater than zero";
     if (params->width <= 1 && params->height <= 1)
 	return "At least one of width and height must be greater than one";
     if (params->barrier_probability < 0)
@@ -968,6 +961,7 @@ static void perturb(int w, int h, unsigned char *tiles, int wrapping,
 
 	break;
     }
+    sfree(perim2);
 
     if (i == nperim)
 	return;			       /* nothing we can do! */
@@ -1235,7 +1229,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
 
 	OFFSET(x2, y2, x1, y1, d1, params);
 	d2 = F(d1);
-#ifdef DEBUG
+#ifdef GENERATION_DIAGNOSTICS
 	printf("picked (%d,%d,%c) <-> (%d,%d,%c)\n",
 	       x1, y1, "0RU3L567D9abcdef"[d1], x2, y2, "0RU3L567D9abcdef"[d2]);
 #endif
@@ -1262,7 +1256,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
 	    xydp = find234(possibilities, &xyd1, NULL);
 
 	    if (xydp) {
-#ifdef DEBUG
+#ifdef GENERATION_DIAGNOSTICS
 		printf("T-piece; removing (%d,%d,%c)\n",
 		       xydp->x, xydp->y, "0RU3L567D9abcdef"[xydp->direction]);
 #endif
@@ -1289,7 +1283,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
 	    xydp = find234(possibilities, &xyd1, NULL);
 
 	    if (xydp) {
-#ifdef DEBUG
+#ifdef GENERATION_DIAGNOSTICS
 		printf("Loop avoidance; removing (%d,%d,%c)\n",
 		       xydp->x, xydp->y, "0RU3L567D9abcdef"[xydp->direction]);
 #endif
@@ -1324,7 +1318,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
 	    if (index(params, tiles, x3, y3))
 		continue;	       /* this would create a loop */
 
-#ifdef DEBUG
+#ifdef GENERATION_DIAGNOSTICS
 	    printf("New frontier; adding (%d,%d,%c)\n",
 		   x2, y2, "0RU3L567D9abcdef"[d]);
 #endif
@@ -1792,6 +1786,11 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
+static void game_changed_state(game_ui *ui, game_state *oldstate,
+                               game_state *newstate)
+{
+}
+
 /* ----------------------------------------------------------------------
  * Process a move.
  */
@@ -1944,7 +1943,10 @@ static game_state *make_move(game_state *state, game_ui *ui,
         ret->last_rotate_dir = 0; /* suppress animation */
         ret->last_rotate_x = ret->last_rotate_y = 0;
 
-    } else assert(0);
+    } else {
+	ret = NULL;  /* placate optimisers which don't understand assert(0) */
+	assert(0);
+    }
 
     /*
      * Check whether the game has been completed.
@@ -2594,6 +2596,7 @@ const struct game thegame = {
     FALSE, game_text_format,
     new_ui,
     free_ui,
+    game_changed_state,
     make_move,
     game_size,
     game_colours,