From f3ba6f8bcefde0ff75971e662841ecef6be56b5a Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 21 May 2005 13:39:23 +0000 Subject: Cleanups: - fix documentation of Net's unique solution option (should have tested before last checkin) - make unique solutions optional in Rectangles too (same reasons) - tidy up various issues in parameter encoding in both games. [originally from svn r5818] --- net.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'net.c') diff --git a/net.c b/net.c index da9e54c..3520483 100644 --- a/net.c +++ b/net.c @@ -201,11 +201,11 @@ static void decode_params(game_params *ret, char const *string) char const *p = string; ret->width = atoi(p); - while (*p && isdigit(*p)) p++; + while (*p && isdigit((unsigned char)*p)) p++; if (*p == 'x') { p++; ret->height = atoi(p); - while (*p && isdigit(*p)) p++; + while (*p && isdigit((unsigned char)*p)) p++; } else { ret->height = ret->width; } @@ -217,11 +217,12 @@ static void decode_params(game_params *ret, char const *string) } else if (*p == 'b') { p++; ret->barrier_probability = atof(p); - while (*p && isdigit(*p)) p++; + while (*p && (*p == '.' || isdigit((unsigned char)*p))) p++; } else if (*p == 'a') { p++; ret->unique = FALSE; - } + } else + p++; /* skip any other gunk */ } } @@ -235,7 +236,7 @@ static char *encode_params(game_params *params, int full) ret[len++] = 'w'; if (full && params->barrier_probability) len += sprintf(ret+len, "b%g", params->barrier_probability); - if (!params->unique) + if (full && !params->unique) ret[len++] = 'a'; assert(len < lenof(ret)); ret[len] = '\0'; -- cgit v1.1