~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UI change to Filling: allow multiple squares to be set at once.
[sgt/puzzles]
/
solo.c
diff --git
a/solo.c
b/solo.c
index
0a4e852
..
bba2cbd
100644
(file)
--- a/
solo.c
+++ b/
solo.c
@@
-207,7
+207,7
@@
static void decode_params(game_params *ret, char const *string)
if (*string == 'r' || *string == 'm' || *string == 'a') {
int sn, sc, sd;
sc = *string++;
if (*string == 'r' || *string == 'm' || *string == 'a') {
int sn, sc, sd;
sc = *string++;
- if (*string == 'd') {
+ if (
sc == 'm' &&
*string == 'd') {
sd = TRUE;
string++;
} else {
sd = TRUE;
string++;
} else {
@@
-1629,7
+1629,7
@@
static int solver(int c, int r, digit *grid, int maxdiff)
if (solver_show_working) {
char *sep = "";
printf("%*srecursing on (%d,%d) [",
if (solver_show_working) {
char *sep = "";
printf("%*srecursing on (%d,%d) [",
- solver_recurse_depth*4, "", x
, y
);
+ solver_recurse_depth*4, "", x
+ 1, y + 1
);
for (i = 0; i < j; i++) {
printf("%s%d", sep, list[i]);
sep = " or ";
for (i = 0; i < j; i++) {
printf("%s%d", sep, list[i]);
sep = " or ";
@@
-1651,7
+1651,7
@@
static int solver(int c, int r, digit *grid, int maxdiff)
#ifdef STANDALONE_SOLVER
if (solver_show_working)
printf("%*sguessing %d at (%d,%d)\n",
#ifdef STANDALONE_SOLVER
if (solver_show_working)
printf("%*sguessing %d at (%d,%d)\n",
- solver_recurse_depth*4, "", list[i], x
, y
);
+ solver_recurse_depth*4, "", list[i], x
+ 1, y + 1
);
solver_recurse_depth++;
#endif
solver_recurse_depth++;
#endif
@@
-1661,7
+1661,7
@@
static int solver(int c, int r, digit *grid, int maxdiff)
solver_recurse_depth--;
if (solver_show_working) {
printf("%*sretracting %d at (%d,%d)\n",
solver_recurse_depth--;
if (solver_show_working) {
printf("%*sretracting %d at (%d,%d)\n",
- solver_recurse_depth*4, "", list[i], x
, y
);
+ solver_recurse_depth*4, "", list[i], x
+ 1, y + 1
);
}
#endif
}
#endif
@@
-3085,7
+3085,7
@@
const struct game thegame = {
TRUE, FALSE, game_print_size, game_print,
FALSE, /* wants_statusbar */
FALSE, game_timing_state,
TRUE, FALSE, game_print_size, game_print,
FALSE, /* wants_statusbar */
FALSE, game_timing_state,
-
0,
/* flags */
+
REQUIRE_RBUTTON | REQUIRE_NUMPAD,
/* flags */
};
#ifdef STANDALONE_SOLVER
};
#ifdef STANDALONE_SOLVER