~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document Unix command-line options.
[sgt/puzzles]
/
guess.c
diff --git
a/guess.c
b/guess.c
index
778a6f5
..
dc1248c
100644
(file)
--- a/
guess.c
+++ b/
guess.c
@@
-860,11
+860,11
@@
static void game_set_size(drawing *dr, game_drawstate *ds,
ds->solny = ds->guessy + ((ds->pegsz + ds->gapsz) * params->nguesses) + ds->gapsz;
assert(ds->pegsz > 0);
ds->solny = ds->guessy + ((ds->pegsz + ds->gapsz) * params->nguesses) + ds->gapsz;
assert(ds->pegsz > 0);
- if (ds->blit_peg) blitter_free(dr, ds->blit_peg);
+ assert(!ds->blit_peg); /* set_size is never called twice */
ds->blit_peg = blitter_new(dr, ds->pegsz, ds->pegsz);
}
ds->blit_peg = blitter_new(dr, ds->pegsz, ds->pegsz);
}
-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), max;
int i;
{
float *ret = snewn(3 * NCOLOURS, float), max;
int i;
@@
-1258,11
+1258,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 FALSE;
-}
-
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;
@@
-1312,9
+1307,9
@@
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,
+ FALSE, /* wants_statusbar */
FALSE, game_timing_state,
FALSE, game_timing_state,
- 0, /*
mouse_prioritie
s */
+ 0, /*
flag
s */
};
/* vim: set shiftwidth=4 tabstop=8: */
};
/* vim: set shiftwidth=4 tabstop=8: */