X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/957099664a88cb1c3d83949355ca87043ae63d9b..b9e2cf12ce824a76676927cdf951124866f7bd09:/puzzles.h diff --git a/puzzles.h b/puzzles.h index 35dc160..b04ec97 100644 --- a/puzzles.h +++ b/puzzles.h @@ -18,6 +18,12 @@ enum { LEFT_BUTTON = 0x1000, MIDDLE_BUTTON, RIGHT_BUTTON, + LEFT_DRAG, + MIDDLE_DRAG, + RIGHT_DRAG, + LEFT_RELEASE, + MIDDLE_RELEASE, + RIGHT_RELEASE, CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, @@ -36,6 +42,7 @@ typedef struct midend_data midend_data; typedef struct random_state random_state; typedef struct game_params game_params; typedef struct game_state game_state; +typedef struct game_ui game_ui; typedef struct game_drawstate game_drawstate; #define ALIGN_VNORMAL 0x000 @@ -103,11 +110,11 @@ void status_bar(frontend *fe, char *text); /* * midend.c */ -midend_data *midend_new(frontend *fe); +midend_data *midend_new(frontend *fe, void *randseed, int randseedsize); void midend_free(midend_data *me); void midend_set_params(midend_data *me, game_params *params); void midend_size(midend_data *me, int *x, int *y); -void midend_new_game(midend_data *me, char *seed); +void midend_new_game(midend_data *me); void midend_restart_game(midend_data *me); int midend_process_key(midend_data *me, int x, int y, int button); void midend_redraw(midend_data *me); @@ -117,8 +124,10 @@ int midend_num_presets(midend_data *me); void midend_fetch_preset(midend_data *me, int n, char **name, game_params **params); int midend_wants_statusbar(midend_data *me); -config_item *midend_get_config(midend_data *me); -char *midend_set_config(midend_data *me, config_item *cfg); +enum { CFG_SETTINGS, CFG_SEED }; +config_item *midend_get_config(midend_data *me, int which, char **wintitle); +char *midend_set_config(midend_data *me, int which, config_item *cfg); +char *midend_game_id(midend_data *me, char *id, int def_seed); /* * malloc.c @@ -126,7 +135,7 @@ char *midend_set_config(midend_data *me, config_item *cfg); void *smalloc(int size); void *srealloc(void *p, int size); void sfree(void *p); -char *dupstr(char *s); +char *dupstr(const char *s); #define snew(type) \ ( (type *) smalloc (sizeof (type)) ) #define snewn(number, type) \ @@ -137,12 +146,13 @@ char *dupstr(char *s); /* * misc.c */ -int rand_upto(int limit); +void free_cfg(config_item *cfg); /* * random.c */ random_state *random_init(char *seed, int len); +unsigned long random_bits(random_state *state, int bits); unsigned long random_upto(random_state *state, unsigned long limit); void random_free(random_state *state); @@ -150,25 +160,32 @@ void random_free(random_state *state); * Game-specific routines */ extern const char *const game_name; +extern const char *const game_winhelp_topic; const int game_can_configure; game_params *default_params(void); int game_fetch_preset(int i, char **name, game_params **params); +game_params *decode_params(char const *string); +char *encode_params(game_params *); void free_params(game_params *params); game_params *dup_params(game_params *params); config_item *game_configure(game_params *params); game_params *custom_params(config_item *cfg); char *validate_params(game_params *params); -char *new_game_seed(game_params *params); +char *new_game_seed(game_params *params, random_state *rs); +char *validate_seed(game_params *params, char *seed); game_state *new_game(game_params *params, char *seed); game_state *dup_game(game_state *state); void free_game(game_state *state); -game_state *make_move(game_state *from, int x, int y, int button); +game_ui *new_ui(game_state *state); +void free_ui(game_ui *ui); +game_state *make_move(game_state *from, game_ui *ui, int x, int y, int button); void game_size(game_params *params, int *x, int *y); float *game_colours(frontend *fe, game_state *state, int *ncolours); game_drawstate *game_new_drawstate(game_state *state); void game_free_drawstate(game_drawstate *ds); void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, - game_state *newstate, float anim_time, float flash_time); + game_state *newstate, game_ui *ui, float anim_time, + float flash_time); float game_anim_length(game_state *oldstate, game_state *newstate); float game_flash_length(game_state *oldstate, game_state *newstate); int game_wants_statusbar(void);