X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/6c3338663ed6d325df532b8f99c60c630f8bb665..522ed78193ce3bb0e5b88f96ac7d2ec4c6c6e2a5:/net.c diff --git a/net.c b/net.c index e4733f6..5ef1ba7 100644 --- a/net.c +++ b/net.c @@ -12,8 +12,6 @@ #include "puzzles.h" #include "tree234.h" -#define PI 3.141592653589793238462643383279502884197169399 - #define MATMUL(xr,yr,m,x,y) do { \ float rx, ry, xx = (x), yy = (y), *mat = (m); \ rx = mat[0] * xx + mat[2] * yy; \ @@ -1146,7 +1144,7 @@ static void perturb(int w, int h, unsigned char *tiles, int wrapping, } static char *new_game_desc(game_params *params, random_state *rs, - game_aux_info **aux) + game_aux_info **aux, int interactive) { tree234 *possibilities, *barriertree; int w, h, x, y, cx, cy, nbarriers; @@ -1558,7 +1556,7 @@ static char *validate_desc(game_params *params, char *desc) * Construct an initial game state, given a description and parameters. */ -static game_state *new_game(game_params *params, char *desc) +static game_state *new_game(midend_data *me, game_params *params, char *desc) { game_state *state; int w, h, x, y; @@ -1798,8 +1796,7 @@ static void free_ui(game_ui *ui) * Process a move. */ static game_state *make_move(game_state *state, game_ui *ui, - int x, int y, int button) -{ + game_drawstate *ds, int x, int y, int button) { game_state *ret, *nullret; int tx, ty, orig; int shift = button & MOD_SHFT, ctrl = button & MOD_CTRL; @@ -2521,7 +2518,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, } static float game_anim_length(game_state *oldstate, - game_state *newstate, int dir) + game_state *newstate, int dir, game_ui *ui) { int last_rotate_dir; @@ -2544,7 +2541,7 @@ static float game_anim_length(game_state *oldstate, } static float game_flash_length(game_state *oldstate, - game_state *newstate, int dir) + game_state *newstate, int dir, game_ui *ui) { /* * If the game has just been completed, we display a completion @@ -2568,6 +2565,11 @@ static int game_wants_statusbar(void) return TRUE; } +static int game_timing_state(game_state *state) +{ + return TRUE; +} + #ifdef COMBINED #define thegame net #endif @@ -2601,4 +2603,6 @@ const struct game thegame = { game_anim_length, game_flash_length, game_wants_statusbar, + FALSE, game_timing_state, + 0, /* mouse_priorities */ };