mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-22 16:32:13 -07:00
Rather than each game backend file exporting a whole load of
functions and a couple of variables, now each one exports a single structure containing a load of function pointers and said variables. This should make it easy to support platforms on which it's sensible to compile all the puzzles into a single monolithic application. The two existing platforms are still one-binary-per-game. [originally from svn r5126]
This commit is contained in:
Simon Tatham
92
fifteen.c
92
fifteen.c
@ -11,10 +11,6 @@
|
||||
|
||||
#include "puzzles.h"
|
||||
|
||||
const char *const game_name = "Fifteen";
|
||||
const char *const game_winhelp_topic = "games.fifteen";
|
||||
const int game_can_configure = TRUE;
|
||||
|
||||
#define TILE_SIZE 48
|
||||
#define BORDER (TILE_SIZE / 2)
|
||||
#define HIGHLIGHT_WIDTH (TILE_SIZE / 20)
|
||||
@ -48,7 +44,7 @@ struct game_state {
|
||||
int movecount;
|
||||
};
|
||||
|
||||
game_params *default_params(void)
|
||||
static game_params *default_params(void)
|
||||
{
|
||||
game_params *ret = snew(game_params);
|
||||
|
||||
@ -57,24 +53,24 @@ game_params *default_params(void)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int game_fetch_preset(int i, char **name, game_params **params)
|
||||
static int game_fetch_preset(int i, char **name, game_params **params)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void free_params(game_params *params)
|
||||
static void free_params(game_params *params)
|
||||
{
|
||||
sfree(params);
|
||||
}
|
||||
|
||||
game_params *dup_params(game_params *params)
|
||||
static game_params *dup_params(game_params *params)
|
||||
{
|
||||
game_params *ret = snew(game_params);
|
||||
*ret = *params; /* structure copy */
|
||||
return ret;
|
||||
}
|
||||
|
||||
game_params *decode_params(char const *string)
|
||||
static game_params *decode_params(char const *string)
|
||||
{
|
||||
game_params *ret = default_params();
|
||||
|
||||
@ -88,7 +84,7 @@ game_params *decode_params(char const *string)
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *encode_params(game_params *params)
|
||||
static char *encode_params(game_params *params)
|
||||
{
|
||||
char data[256];
|
||||
|
||||
@ -97,7 +93,7 @@ char *encode_params(game_params *params)
|
||||
return dupstr(data);
|
||||
}
|
||||
|
||||
config_item *game_configure(game_params *params)
|
||||
static config_item *game_configure(game_params *params)
|
||||
{
|
||||
config_item *ret;
|
||||
char buf[80];
|
||||
@ -124,7 +120,7 @@ config_item *game_configure(game_params *params)
|
||||
return ret;
|
||||
}
|
||||
|
||||
game_params *custom_params(config_item *cfg)
|
||||
static game_params *custom_params(config_item *cfg)
|
||||
{
|
||||
game_params *ret = snew(game_params);
|
||||
|
||||
@ -134,7 +130,7 @@ game_params *custom_params(config_item *cfg)
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *validate_params(game_params *params)
|
||||
static char *validate_params(game_params *params)
|
||||
{
|
||||
if (params->w < 2 && params->h < 2)
|
||||
return "Width and height must both be at least two";
|
||||
@ -142,7 +138,7 @@ char *validate_params(game_params *params)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int perm_parity(int *perm, int n)
|
||||
static int perm_parity(int *perm, int n)
|
||||
{
|
||||
int i, j, ret;
|
||||
|
||||
@ -156,7 +152,7 @@ int perm_parity(int *perm, int n)
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *new_game_seed(game_params *params, random_state *rs)
|
||||
static char *new_game_seed(game_params *params, random_state *rs)
|
||||
{
|
||||
int gap, n, i, x;
|
||||
int x1, x2, p1, p2, parity;
|
||||
@ -271,7 +267,7 @@ char *new_game_seed(game_params *params, random_state *rs)
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *validate_seed(game_params *params, char *seed)
|
||||
static char *validate_seed(game_params *params, char *seed)
|
||||
{
|
||||
char *p, *err;
|
||||
int i, area;
|
||||
@ -322,7 +318,7 @@ char *validate_seed(game_params *params, char *seed)
|
||||
return err;
|
||||
}
|
||||
|
||||
game_state *new_game(game_params *params, char *seed)
|
||||
static game_state *new_game(game_params *params, char *seed)
|
||||
{
|
||||
game_state *state = snew(game_state);
|
||||
int i;
|
||||
@ -353,7 +349,7 @@ game_state *new_game(game_params *params, char *seed)
|
||||
return state;
|
||||
}
|
||||
|
||||
game_state *dup_game(game_state *state)
|
||||
static game_state *dup_game(game_state *state)
|
||||
{
|
||||
game_state *ret = snew(game_state);
|
||||
|
||||
@ -369,21 +365,22 @@ game_state *dup_game(game_state *state)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void free_game(game_state *state)
|
||||
static void free_game(game_state *state)
|
||||
{
|
||||
sfree(state);
|
||||
}
|
||||
|
||||
game_ui *new_ui(game_state *state)
|
||||
static game_ui *new_ui(game_state *state)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void free_ui(game_ui *ui)
|
||||
static void free_ui(game_ui *ui)
|
||||
{
|
||||
}
|
||||
|
||||
game_state *make_move(game_state *from, game_ui *ui, int x, int y, int button)
|
||||
static game_state *make_move(game_state *from, game_ui *ui,
|
||||
int x, int y, int button)
|
||||
{
|
||||
int gx, gy, dx, dy, ux, uy, up, p;
|
||||
game_state *ret;
|
||||
@ -457,13 +454,13 @@ struct game_drawstate {
|
||||
int *tiles;
|
||||
};
|
||||
|
||||
void game_size(game_params *params, int *x, int *y)
|
||||
static void game_size(game_params *params, int *x, int *y)
|
||||
{
|
||||
*x = TILE_SIZE * params->w + 2 * BORDER;
|
||||
*y = TILE_SIZE * params->h + 2 * BORDER;
|
||||
}
|
||||
|
||||
float *game_colours(frontend *fe, game_state *state, int *ncolours)
|
||||
static float *game_colours(frontend *fe, game_state *state, int *ncolours)
|
||||
{
|
||||
float *ret = snewn(3 * NCOLOURS, float);
|
||||
int i;
|
||||
@ -494,7 +491,7 @@ float *game_colours(frontend *fe, game_state *state, int *ncolours)
|
||||
return ret;
|
||||
}
|
||||
|
||||
game_drawstate *game_new_drawstate(game_state *state)
|
||||
static game_drawstate *game_new_drawstate(game_state *state)
|
||||
{
|
||||
struct game_drawstate *ds = snew(struct game_drawstate);
|
||||
int i;
|
||||
@ -510,7 +507,7 @@ game_drawstate *game_new_drawstate(game_state *state)
|
||||
return ds;
|
||||
}
|
||||
|
||||
void game_free_drawstate(game_drawstate *ds)
|
||||
static void game_free_drawstate(game_drawstate *ds)
|
||||
{
|
||||
sfree(ds->tiles);
|
||||
sfree(ds);
|
||||
@ -552,7 +549,7 @@ static void draw_tile(frontend *fe, game_state *state, int x, int y,
|
||||
draw_update(fe, x, y, TILE_SIZE, TILE_SIZE);
|
||||
}
|
||||
|
||||
void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
|
||||
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
|
||||
game_state *state, int dir, game_ui *ui,
|
||||
float animtime, float flashtime)
|
||||
{
|
||||
@ -702,12 +699,14 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
|
||||
}
|
||||
}
|
||||
|
||||
float game_anim_length(game_state *oldstate, game_state *newstate, int dir)
|
||||
static float game_anim_length(game_state *oldstate,
|
||||
game_state *newstate, int dir)
|
||||
{
|
||||
return ANIM_TIME;
|
||||
}
|
||||
|
||||
float game_flash_length(game_state *oldstate, game_state *newstate, int dir)
|
||||
static float game_flash_length(game_state *oldstate,
|
||||
game_state *newstate, int dir)
|
||||
{
|
||||
if (!oldstate->completed && newstate->completed)
|
||||
return 2 * FLASH_FRAME;
|
||||
@ -715,7 +714,40 @@ float game_flash_length(game_state *oldstate, game_state *newstate, int dir)
|
||||
return 0.0F;
|
||||
}
|
||||
|
||||
int game_wants_statusbar(void)
|
||||
static int game_wants_statusbar(void)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#ifdef COMBINED
|
||||
#define thegame fifteen
|
||||
#endif
|
||||
|
||||
const struct game thegame = {
|
||||
"Fifteen", "games.fifteen", TRUE,
|
||||
default_params,
|
||||
game_fetch_preset,
|
||||
decode_params,
|
||||
encode_params,
|
||||
free_params,
|
||||
dup_params,
|
||||
game_configure,
|
||||
custom_params,
|
||||
validate_params,
|
||||
new_game_seed,
|
||||
validate_seed,
|
||||
new_game,
|
||||
dup_game,
|
||||
free_game,
|
||||
new_ui,
|
||||
free_ui,
|
||||
make_move,
|
||||
game_size,
|
||||
game_colours,
|
||||
game_new_drawstate,
|
||||
game_free_drawstate,
|
||||
game_redraw,
|
||||
game_anim_length,
|
||||
game_flash_length,
|
||||
game_wants_statusbar,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user