zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use a proper union in struct config_item.

Browse Source 
This allows me to use different types for the mutable, dynamically
allocated string value in a C_STRING control and the fixed constant
list of option names in a C_CHOICES.
This commit is contained in:
Simon Tatham
2017-10-01 13:38:35 +01:00
parent eeb2db283d
commit de67801b0f
51 changed files with 528 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
twiddle.c
View File

@ -156,41 +156,33 @@ static config_item *game_configure(const game_params *params)
ret[0].name = "Width";
ret[0].type = C_STRING;
sprintf(buf, "%d", params->w);
ret[0].sval = dupstr(buf);
ret[0].ival = 0;
ret[0].u.string.sval = dupstr(buf);
ret[1].name = "Height";
ret[1].type = C_STRING;
sprintf(buf, "%d", params->h);
ret[1].sval = dupstr(buf);
ret[1].ival = 0;
ret[1].u.string.sval = dupstr(buf);
ret[2].name = "Rotating block size";
ret[2].type = C_STRING;
sprintf(buf, "%d", params->n);
ret[2].sval = dupstr(buf);
ret[2].ival = 0;
ret[2].u.string.sval = dupstr(buf);
ret[3].name = "One number per row";
ret[3].type = C_BOOLEAN;
ret[3].sval = NULL;
ret[3].ival = params->rowsonly;
ret[3].u.boolean.bval = params->rowsonly;
ret[4].name = "Orientation matters";
ret[4].type = C_BOOLEAN;
ret[4].sval = NULL;
ret[4].ival = params->orientable;
ret[4].u.boolean.bval = params->orientable;
ret[5].name = "Number of shuffling moves";
ret[5].type = C_STRING;
sprintf(buf, "%d", params->movetarget);
ret[5].sval = dupstr(buf);
ret[5].ival = 0;
ret[5].u.string.sval = dupstr(buf);
ret[6].name = NULL;
ret[6].type = C_END;
ret[6].sval = NULL;
ret[6].ival = 0;
return ret;
}
@ -199,12 +191,12 @@ static game_params *custom_params(const config_item *cfg)
{
game_params *ret = snew(game_params);
ret->w = atoi(cfg[0].sval);
ret->h = atoi(cfg[1].sval);
ret->n = atoi(cfg[2].sval);
ret->rowsonly = cfg[3].ival;
ret->orientable = cfg[4].ival;
ret->movetarget = atoi(cfg[5].sval);
ret->w = atoi(cfg[0].u.string.sval);
ret->h = atoi(cfg[1].u.string.sval);
ret->n = atoi(cfg[2].u.string.sval);
ret->rowsonly = cfg[3].u.boolean.bval;
ret->orientable = cfg[4].u.boolean.bval;
ret->movetarget = atoi(cfg[5].u.string.sval);
return ret;
}