~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply a missing bit of r9164, which only broke the build with
[sgt/puzzles]
/
signpost.c
diff --git
a/signpost.c
b/signpost.c
index
b6db3a3
..
fdeadba
100644
(file)
--- a/
signpost.c
+++ b/
signpost.c
@@
-513,7
+513,7
@@
static void unpick_desc(game_params *params, char *desc,
}
c = *desc;
}
c = *desc;
- if (isdigit(c)) {
+ if (isdigit(
(unsigned char)
c)) {
num = (num*10) + (int)(c-'0');
if (num > state->n) {
msg = "Number too large";
num = (num*10) + (int)(c-'0');
if (num > state->n) {
msg = "Number too large";
@@
-1496,7
+1496,7
@@
static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
if (state->prev[si] == -1 && state->next[si] == -1)
return "";
sprintf(buf, "%c%d,%d",
if (state->prev[si] == -1 && state->next[si] == -1)
return "";
sprintf(buf, "%c%d,%d",
-
ui->drag_is_from ? 'C' : 'X'
, ui->sx, ui->sy);
+
(int)(ui->drag_is_from ? 'C' : 'X')
, ui->sx, ui->sy);
return dupstr(buf);
}
return dupstr(buf);
}
@@
-1515,7
+1515,7
@@
static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
if (state->prev[si] == -1 && state->next[si] == -1)
return "";
sprintf(buf, "%c%d,%d",
if (state->prev[si] == -1 && state->next[si] == -1)
return "";
sprintf(buf, "%c%d,%d",
- (
button == 'x') ? 'C' : 'X'
, ui->cx, ui->cy);
+ (
int)((button == 'x') ? 'C' : 'X')
, ui->cx, ui->cy);
return dupstr(buf);
}
return dupstr(buf);
}
@@
-2122,6
+2122,11
@@
static float game_flash_length(game_state *oldstate, game_state *newstate,
return 0.0F;
}
return 0.0F;
}
+static int game_is_solved(game_state *state)
+{
+ return state->completed;
+}
+
static int game_timing_state(game_state *state, game_ui *ui)
{
return TRUE;
static int game_timing_state(game_state *state, game_ui *ui)
{
return TRUE;
@@
-2203,10
+2208,11
@@
const struct game thegame = {
game_redraw,
game_anim_length,
game_flash_length,
game_redraw,
game_anim_length,
game_flash_length,
+ game_is_solved,
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,
- REQUIRE_RBUTTON
| REQUIRE_NUMPAD,
/* flags */
+ REQUIRE_RBUTTON
,
/* flags */
};
#ifdef STANDALONE_SOLVER
};
#ifdef STANDALONE_SOLVER