~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document the new --game and --load options on Unix.
[sgt/puzzles]
/
flip.c
diff --git
a/flip.c
b/flip.c
index
44fcf15
..
0a537c3
100644
(file)
--- a/
flip.c
+++ b/
flip.c
@@
-1019,7
+1019,7
@@
static void game_set_size(drawing *dr, game_drawstate *ds,
ds->tilesize = tilesize;
}
ds->tilesize = tilesize;
}
-static float *game_colours(frontend *fe,
game_state *state,
int *ncolours)
+static float *game_colours(frontend *fe, int *ncolours)
{
float *ret = snewn(3 * NCOLOURS, float);
{
float *ret = snewn(3 * NCOLOURS, float);
@@
-1193,7
+1193,6
@@
static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
int fx, fy, fd;
int v = state->grid[i];
int vv;
int fx, fy, fd;
int v = state->grid[i];
int vv;
- int hintmask = (state->hints_active ? ~0 : ~2);
if (flashframe >= 0) {
fx = (w+1)/2 - min(x+1, w-x);
if (flashframe >= 0) {
fx = (w+1)/2 - min(x+1, w-x);
@@
-1205,11
+1204,12
@@
static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
v &= ~1;
}
v &= ~1;
}
- v &= hintmask;
+ if (!state->hints_active)
+ v &= ~2;
if (ui->cdraw && ui->cx == x && ui->cy == y)
v |= 4;
if (ui->cdraw && ui->cx == x && ui->cy == y)
v |= 4;
- if (oldstate && ((state->grid[i] ^ oldstate->grid[i]) &
hintmask
))
+ if (oldstate && ((state->grid[i] ^ oldstate->grid[i]) &
~ 2
))
vv = 255; /* means `animated' */
else
vv = v;
vv = 255; /* means `animated' */
else
vv = v;
@@
-1248,11
+1248,6
@@
static float game_flash_length(game_state *oldstate, game_state *newstate,
return 0.0F;
}
return 0.0F;
}
-static int game_wants_statusbar(void)
-{
- return TRUE;
-}
-
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;
@@
-1271,7
+1266,7
@@
static void game_print(drawing *dr, game_state *state, int tilesize)
#endif
const struct game thegame = {
#endif
const struct game thegame = {
- "Flip", "games.flip",
+ "Flip", "games.flip",
"flip",
default_params,
game_fetch_preset,
decode_params,
default_params,
game_fetch_preset,
decode_params,
@@
-1302,7
+1297,7
@@
const struct game thegame = {
game_anim_length,
game_flash_length,
FALSE, FALSE, game_print_size, game_print,
game_anim_length,
game_flash_length,
FALSE, FALSE, game_print_size, game_print,
- game_wants_statusbar,
+ TRUE, /* wants_statusbar */
FALSE, game_timing_state,
FALSE, game_timing_state,
- 0, /*
mouse_prioritie
s */
+ 0, /*
flag
s */
};
};