chiark
/
gitweb
/
~ian
/
sgt-puzzles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a proper union in struct config_item.
[sgt-puzzles.git]
/
range.c
diff --git
a/range.c
b/range.c
index 8017f8dc4b14c21058550d4ece6730e9abae9179..dd7ecbc61d5e6e17dfa240520cb9cd61f84554d5 100644
(file)
--- a/
range.c
+++ b/
range.c
@@
-170,18
+170,14
@@
static config_item *game_configure(const game_params *params)
ret[0].name = "Width";
ret[0].type = C_STRING;
ret[0].name = "Width";
ret[0].type = C_STRING;
- ret[0].sval = nfmtstr(10, "%d", params->w);
- ret[0].ival = 0;
+ ret[0].u.string.sval = nfmtstr(10, "%d", params->w);
ret[1].name = "Height";
ret[1].type = C_STRING;
ret[1].name = "Height";
ret[1].type = C_STRING;
- ret[1].sval = nfmtstr(10, "%d", params->h);
- ret[1].ival = 0;
+ ret[1].u.string.sval = nfmtstr(10, "%d", params->h);
ret[2].name = NULL;
ret[2].type = C_END;
ret[2].name = NULL;
ret[2].type = C_END;
- ret[2].sval = NULL;
- ret[2].ival = 0;
return ret;
}
return ret;
}
@@
-189,8
+185,8
@@
static config_item *game_configure(const game_params *params)
static game_params *custom_params(const config_item *configuration)
{
game_params *ret = snew(game_params);
static game_params *custom_params(const config_item *configuration)
{
game_params *ret = snew(game_params);
- ret->w = atoi(configuration[0].sval);
- ret->h = atoi(configuration[1].sval);
+ ret->w = atoi(configuration[0].
u.string.
sval);
+ ret->h = atoi(configuration[1].
u.string.
sval);
return ret;
}
return ret;
}