Use a proper union in struct config_item.

[sgt-puzzles.git] / untangle.c

diff --git a/untangle.c b/untangle.c
index 4dd93be36165c7327a3e16242c0b3636650d3124..4dfe208a147c60b7eb1d96e4eccaafc2f37ff30d 100644 (file)
--- a/untangle.c
+++ b/untangle.c
@@ -185,13 +185,10 @@ static config_item *game_configure(const game_params *params)
     ret[0].name = "Number of points";
     ret[0].type = C_STRING;
     sprintf(buf, "%d", params->n);
-    ret[0].sval = dupstr(buf);
-    ret[0].ival = 0;
+    ret[0].u.string.sval = dupstr(buf);
 
     ret[1].name = NULL;
     ret[1].type = C_END;
-    ret[1].sval = NULL;
-    ret[1].ival = 0;
 
     return ret;
 }
@@ -200,7 +197,7 @@ static game_params *custom_params(const config_item *cfg)
 {
     game_params *ret = snew(game_params);
 
-    ret->n = atoi(cfg[0].sval);
+    ret->n = atoi(cfg[0].u.string.sval);
 
     return ret;
 }