~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In Windows/Gtk front-ends, consistently use the ellipsis convention for naming
[sgt/puzzles]
/
map.c
diff --git
a/map.c
b/map.c
index
6302ef7
..
098fc47
100644
(file)
--- a/
map.c
+++ b/
map.c
@@
-1695,8
+1695,7
@@
static char *parse_edge_list(game_params *params, char **desc, int *map)
int i, k, pos, state;
char *p = *desc;
int i, k, pos, state;
char *p = *desc;
- for (i = 0; i < wh; i++)
- map[wh+i] = i;
+ dsf_init(map+wh, wh);
pos = -1;
state = 0;
pos = -1;
state = 0;
@@
-1868,7
+1867,7
@@
static game_state *new_game(midend *me, game_params *params, char *desc)
* outlines by the judicious use of diagonally divided squares.
*/
{
* outlines by the judicious use of diagonally divided squares.
*/
{
- random_state *rs = random_
init
(desc, strlen(desc));
+ random_state *rs = random_
new
(desc, strlen(desc));
int *squares = snewn(wh, int);
int done_something;
int *squares = snewn(wh, int);
int done_something;
@@
-2527,7
+2526,7
@@
const int map_hatching[FOUR] = {
HATCH_VERT, HATCH_SLASH, HATCH_HORIZ, HATCH_BACKSLASH
};
HATCH_VERT, HATCH_SLASH, HATCH_HORIZ, HATCH_BACKSLASH
};
-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);
@@
-2923,11
+2922,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;
@@
-3090,7
+3084,7
@@
static void game_print(drawing *dr, game_state *state, int tilesize)
#endif
const struct game thegame = {
#endif
const struct game thegame = {
- "Map", "games.map",
+ "Map", "games.map",
"map",
default_params,
game_fetch_preset,
decode_params,
default_params,
game_fetch_preset,
decode_params,
@@
-3121,9
+3115,9
@@
const struct game thegame = {
game_anim_length,
game_flash_length,
TRUE, TRUE, game_print_size, game_print,
game_anim_length,
game_flash_length,
TRUE, TRUE, 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 */
};
#ifdef STANDALONE_SOLVER
};
#ifdef STANDALONE_SOLVER