zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Liam Clarke points out that the use of the word 'radius' to describe

Browse Source 
the size of the rotating sections in Twiddle is a misnomer, since
it's actually measuring something more like the diameter of the
section. Replace the word throughout with 'rotating block size' or
similar.

[originally from svn r9013]
This commit is contained in:
Simon Tatham
2010-10-01 11:46:32 +00:00
parent f1ad38971c
commit 64e78f644c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
twiddle.c
View File

@ -21,7 +21,7 @@
#define COORD(x) ( (x) * TILE_SIZE + BORDER ) #define COORD(x) ( (x) * TILE_SIZE + BORDER )
#define FROMCOORD(x) ( ((x) - BORDER + TILE_SIZE) / TILE_SIZE - 1 ) #define FROMCOORD(x) ( ((x) - BORDER + TILE_SIZE) / TILE_SIZE - 1 )
#define ANIM_PER_RADIUS_UNIT 0.13F #define ANIM_PER_BLKSIZE_UNIT 0.13F
#define FLASH_FRAME 0.13F #define FLASH_FRAME 0.13F
enum { enum {
@ -88,9 +88,9 @@ static int game_fetch_preset(int i, char **name, game_params **params)
{ "3x3 orientable", { 3, 3, 2, FALSE, TRUE } }, { "3x3 orientable", { 3, 3, 2, FALSE, TRUE } },
{ "4x4 normal", { 4, 4, 2, FALSE } }, { "4x4 normal", { 4, 4, 2, FALSE } },
{ "4x4 orientable", { 4, 4, 2, FALSE, TRUE } }, { "4x4 orientable", { 4, 4, 2, FALSE, TRUE } },
{ "4x4 radius 3", { 4, 4, 3, FALSE } }, { "4x4, rotating 3x3 blocks", { 4, 4, 3, FALSE } },
{ "5x5 radius 3", { 5, 5, 3, FALSE } }, { "5x5, rotating 3x3 blocks", { 5, 5, 3, FALSE } },
{ "6x6 radius 4", { 6, 6, 4, FALSE } }, { "6x6, rotating 4x4 blocks", { 6, 6, 4, FALSE } },
}; };
if (i < 0 || i >= lenof(presets)) if (i < 0 || i >= lenof(presets))
@ -165,7 +165,7 @@ static config_item *game_configure(game_params *params)
ret[1].sval = dupstr(buf); ret[1].sval = dupstr(buf);
ret[1].ival = 0; ret[1].ival = 0;
ret[2].name = "Rotation radius"; ret[2].name = "Rotating block size";
ret[2].type = C_STRING; ret[2].type = C_STRING;
sprintf(buf, "%d", params->n); sprintf(buf, "%d", params->n);
ret[2].sval = dupstr(buf); ret[2].sval = dupstr(buf);
@ -212,11 +212,11 @@ static game_params *custom_params(config_item *cfg)
static char *validate_params(game_params *params, int full) static char *validate_params(game_params *params, int full)
{ {
if (params->n < 2) if (params->n < 2)
return "Rotation radius must be at least two"; return "Rotating block size must be at least two";
if (params->w < params->n) if (params->w < params->n)
return "Width must be at least the rotation radius"; return "Width must be at least the rotating block size";
if (params->h < params->n) if (params->h < params->n)
return "Height must be at least the rotation radius"; return "Height must be at least the rotating block size";
return NULL; return NULL;
} }
@ -1057,7 +1057,7 @@ static int highlight_colour(float angle)
static float game_anim_length(game_state *oldstate, game_state *newstate, static float game_anim_length(game_state *oldstate, game_state *newstate,
int dir, game_ui *ui) int dir, game_ui *ui)
{ {
return (float)(ANIM_PER_RADIUS_UNIT * sqrt(newstate->n-1)); return (float)(ANIM_PER_BLKSIZE_UNIT * sqrt(newstate->n-1));
} }
static float game_flash_length(game_state *oldstate, game_state *newstate, static float game_flash_length(game_state *oldstate, game_state *newstate,