~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot to set 'has_incentre' on triangular grids, which don't use
[sgt/puzzles]
/
nullgame.c
diff --git
a/nullgame.c
b/nullgame.c
index
3d5270d
..
1484587
100644
(file)
--- a/
nullgame.c
+++ b/
nullgame.c
@@
-59,16
+59,11
@@
static game_params *dup_params(game_params *params)
return ret;
}
return ret;
}
-static
game_params *decode_params(
char const *string)
+static
void decode_params(game_params *params,
char const *string)
{
{
- game_params *ret = snew(game_params);
-
- ret->FIXME = 0;
-
- return ret;
}
}
-static char *encode_params(game_params *params)
+static char *encode_params(game_params *params
, int full
)
{
return dupstr("FIXME");
}
{
return dupstr("FIXME");
}
@@
-83,22
+78,23
@@
static game_params *custom_params(config_item *cfg)
return NULL;
}
return NULL;
}
-static char *validate_params(game_params *params)
+static char *validate_params(game_params *params
, int full
)
{
return NULL;
}
{
return NULL;
}
-static char *new_game_seed(game_params *params, random_state *rs)
+static char *new_game_desc(game_params *params, random_state *rs,
+ char **aux, int interactive)
{
return dupstr("FIXME");
}
{
return dupstr("FIXME");
}
-static char *validate_
seed(game_params *params, char *seed
)
+static char *validate_
desc(game_params *params, char *desc
)
{
return NULL;
}
{
return NULL;
}
-static game_state *new_game(
game_params *params, char *seed
)
+static game_state *new_game(
midend *me, game_params *params, char *desc
)
{
game_state *state = snew(game_state);
{
game_state *state = snew(game_state);
@@
-121,6
+117,22
@@
static void free_game(game_state *state)
sfree(state);
}
sfree(state);
}
+static char *solve_game(game_state *state, game_state *currstate,
+ char *aux, char **error)
+{
+ return NULL;
+}
+
+static int game_can_format_as_text_now(game_params *params)
+{
+ return TRUE;
+}
+
+static char *game_text_format(game_state *state)
+{
+ return NULL;
+}
+
static game_ui *new_ui(game_state *state)
{
return NULL;
static game_ui *new_ui(game_state *state)
{
return NULL;
@@
-130,26
+142,53
@@
static void free_ui(game_ui *ui)
{
}
{
}
-static game_state *make_move(game_state *from, game_ui *ui, int x, int y,
- int button)
+static char *encode_ui(game_ui *ui)
{
return NULL;
}
{
return NULL;
}
-/* ----------------------------------------------------------------------
- * Drawing routines.
- */
+static void decode_ui(game_ui *ui, char *encoding)
+{
+}
+
+static void game_changed_state(game_ui *ui, game_state *oldstate,
+ game_state *newstate)
+{
+}
struct game_drawstate {
struct game_drawstate {
+ int tilesize;
int FIXME;
};
int FIXME;
};
-static void game_size(game_params *params, int *x, int *y)
+static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
+ int x, int y, int button)
{
{
- *x = *y = 200; /* FIXME */
+ return NULL;
+}
+
+static game_state *execute_move(game_state *state, char *move)
+{
+ return NULL;
+}
+
+/* ----------------------------------------------------------------------
+ * Drawing routines.
+ */
+
+static void game_compute_size(game_params *params, int tilesize,
+ int *x, int *y)
+{
+ *x = *y = 10 * tilesize; /* FIXME */
}
}
-static float *game_colours(frontend *fe, game_state *state, int *ncolours)
+static void game_set_size(drawing *dr, game_drawstate *ds,
+ game_params *params, int tilesize)
+{
+ ds->tilesize = tilesize;
+}
+
+static float *game_colours(frontend *fe, int *ncolours)
{
float *ret = snewn(3 * NCOLOURS, float);
{
float *ret = snewn(3 * NCOLOURS, float);
@@
-159,21
+198,22
@@
static float *game_colours(frontend *fe, game_state *state, int *ncolours)
return ret;
}
return ret;
}
-static game_drawstate *game_new_drawstate(game_state *state)
+static game_drawstate *game_new_drawstate(
drawing *dr,
game_state *state)
{
struct game_drawstate *ds = snew(struct game_drawstate);
{
struct game_drawstate *ds = snew(struct game_drawstate);
+ ds->tilesize = 0;
ds->FIXME = 0;
return ds;
}
ds->FIXME = 0;
return ds;
}
-static void game_free_drawstate(game_drawstate *ds)
+static void game_free_drawstate(
drawing *dr,
game_drawstate *ds)
{
sfree(ds);
}
{
sfree(ds);
}
-static void game_redraw(
frontend *fe
, game_drawstate *ds, game_state *oldstate,
+static void game_redraw(
drawing *dr
, game_drawstate *ds, game_state *oldstate,
game_state *state, int dir, game_ui *ui,
float animtime, float flashtime)
{
game_state *state, int dir, game_ui *ui,
float animtime, float flashtime)
{
@@
-183,55
+223,77
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
* should start by drawing a big background-colour rectangle
* covering the whole window.
*/
* should start by drawing a big background-colour rectangle
* covering the whole window.
*/
- draw_rect(
fe, 0, 0, 200, 200
, COL_BACKGROUND);
+ draw_rect(
dr, 0, 0, 10*ds->tilesize, 10*ds->tilesize
, COL_BACKGROUND);
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
- int dir)
+ int dir
, game_ui *ui
)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
- int dir)
+ int dir
, game_ui *ui
)
{
return 0.0F;
}
{
return 0.0F;
}
-static int game_
wants_statusbar(void
)
+static int game_
is_solved(game_state *state
)
{
return FALSE;
}
{
return FALSE;
}
+static int game_timing_state(game_state *state, game_ui *ui)
+{
+ return TRUE;
+}
+
+static void game_print_size(game_params *params, float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, game_state *state, int tilesize)
+{
+}
+
#ifdef COMBINED
#define thegame nullgame
#endif
const struct game thegame = {
#ifdef COMBINED
#define thegame nullgame
#endif
const struct game thegame = {
- "Null Game", NULL,
FALSE
,
+ "Null Game", NULL,
NULL
,
default_params,
game_fetch_preset,
decode_params,
encode_params,
free_params,
dup_params,
default_params,
game_fetch_preset,
decode_params,
encode_params,
free_params,
dup_params,
- game_configure,
- custom_params,
+ FALSE, game_configure, custom_params,
validate_params,
validate_params,
- new_game_
seed
,
- validate_
seed
,
+ new_game_
desc
,
+ validate_
desc
,
new_game,
dup_game,
free_game,
new_game,
dup_game,
free_game,
+ FALSE, solve_game,
+ FALSE, game_can_format_as_text_now, game_text_format,
new_ui,
free_ui,
new_ui,
free_ui,
- make_move,
- game_size,
+ encode_ui,
+ decode_ui,
+ game_changed_state,
+ interpret_move,
+ execute_move,
+ 20 /* FIXME */, game_compute_size, game_set_size,
game_colours,
game_new_drawstate,
game_free_drawstate,
game_redraw,
game_anim_length,
game_flash_length,
game_colours,
game_new_drawstate,
game_free_drawstate,
game_redraw,
game_anim_length,
game_flash_length,
- game_wants_statusbar,
+ game_is_solved,
+ FALSE, FALSE, game_print_size, game_print,
+ FALSE, /* wants_statusbar */
+ FALSE, game_timing_state,
+ 0, /* flags */
};
};