~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove debug output.
[sgt/puzzles]
/
pattern.c
diff --git
a/pattern.c
b/pattern.c
index
e09ed3d
..
523374d
100644
(file)
--- a/
pattern.c
+++ b/
pattern.c
@@
-11,9
+11,6
@@
#include "puzzles.h"
#include "puzzles.h"
-#define max(x,y) ( (x)>(y) ? (x):(y) )
-#define min(x,y) ( (x)<(y) ? (x):(y) )
-
enum {
COL_BACKGROUND,
COL_EMPTY,
enum {
COL_BACKGROUND,
COL_EMPTY,
@@
-23,15
+20,17
@@
enum {
NCOLOURS
};
NCOLOURS
};
-#define BORDER 18
+#define PREFERRED_TILE_SIZE 24
+#define TILE_SIZE (ds->tilesize)
+#define BORDER (3 * TILE_SIZE / 4)
#define TLBORDER(d) ( (d) / 5 + 2 )
#define TLBORDER(d) ( (d) / 5 + 2 )
-#define GUTTER 12
-#define TILE_SIZE 24
+#define GUTTER (TILE_SIZE / 2)
#define FROMCOORD(d, x) \
( ((x) - (BORDER + GUTTER + TILE_SIZE * TLBORDER(d))) / TILE_SIZE )
#define SIZE(d) (2*BORDER + GUTTER + TILE_SIZE * (TLBORDER(d) + (d)))
#define FROMCOORD(d, x) \
( ((x) - (BORDER + GUTTER + TILE_SIZE * TLBORDER(d))) / TILE_SIZE )
#define SIZE(d) (2*BORDER + GUTTER + TILE_SIZE * (TLBORDER(d) + (d)))
+#define GETTILESIZE(d, w) (w / (2 + TLBORDER(d) + (d)))
#define TOCOORD(d, x) (BORDER + GUTTER + TILE_SIZE * (TLBORDER(d) + (x)))
#define TOCOORD(d, x) (BORDER + GUTTER + TILE_SIZE * (TLBORDER(d) + (x)))
@@
-62,24
+61,26
@@
static game_params *default_params(void)
return ret;
}
return ret;
}
+static const struct game_params pattern_presets[] = {
+ {10, 10},
+ {15, 15},
+ {20, 20},
+#ifndef SLOW_SYSTEM
+ {25, 25},
+ {30, 30},
+#endif
+};
+
static int game_fetch_preset(int i, char **name, game_params **params)
{
game_params *ret;
char str[80];
static int game_fetch_preset(int i, char **name, game_params **params)
{
game_params *ret;
char str[80];
- static const struct { int x, y; } values[] = {
- {10, 10},
- {15, 15},
- {20, 20},
- {25, 25},
- {30, 30},
- };
-
- if (i < 0 || i >= lenof(values))
+
+ if (i < 0 || i >= lenof(pattern_presets))
return FALSE;
ret = snew(game_params);
return FALSE;
ret = snew(game_params);
- ret->w = values[i].x;
- ret->h = values[i].y;
+ *ret = pattern_presets[i];
sprintf(str, "%dx%d", ret->w, ret->h);
sprintf(str, "%dx%d", ret->w, ret->h);
@@
-166,12
+167,8
@@
static game_params *custom_params(config_item *cfg)
static char *validate_params(game_params *params)
{
static char *validate_params(game_params *params)
{
- if (params->w <= 0
&&
params->h <= 0)
+ if (params->w <= 0
||
params->h <= 0)
return "Width and height must both be greater than zero";
return "Width and height must both be greater than zero";
- if (params->w <= 0)
- return "Width must be greater than zero";
- if (params->h <= 0)
- return "Height must be greater than zero";
return NULL;
}
return NULL;
}
@@
-475,7
+472,7
@@
struct game_aux_info {
};
static char *new_game_desc(game_params *params, random_state *rs,
};
static char *new_game_desc(game_params *params, random_state *rs,
- game_aux_info **aux)
+ game_aux_info **aux
, int interactive
)
{
unsigned char *grid;
int i, j, max, rowlen, *rowdata;
{
unsigned char *grid;
int i, j, max, rowlen, *rowdata;
@@
-494,8
+491,7
@@
static char *new_game_desc(game_params *params, random_state *rs,
ai->w = params->w;
ai->h = params->h;
ai->w = params->w;
ai->h = params->h;
- ai->grid = snewn(ai->w * ai->h, unsigned char);
- memcpy(ai->grid, grid, ai->w * ai->h);
+ ai->grid = grid;
*aux = ai;
}
*aux = ai;
}
@@
-601,7
+597,7
@@
static char *validate_desc(game_params *params, char *desc)
return NULL;
}
return NULL;
}
-static game_state *new_game(game_params *params, char *desc)
+static game_state *new_game(
midend_data *me,
game_params *params, char *desc)
{
int i;
char *p;
{
int i;
char *p;
@@
-764,9
+760,20
@@
static void free_ui(game_ui *ui)
sfree(ui);
}
sfree(ui);
}
-static
game_state *make_move(game_state *from, game_ui *ui
,
-
int x, int y, int button
)
+static
void game_changed_state(game_ui *ui, game_state *oldstate
,
+
game_state *newstate
)
{
{
+}
+
+struct game_drawstate {
+ int started;
+ int w, h;
+ int tilesize;
+ unsigned char *visible;
+};
+
+static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
+ int x, int y, int button) {
game_state *ret;
button &= ~MOD_MASK;
game_state *ret;
button &= ~MOD_MASK;
@@
-897,14
+904,17
@@
static game_state *make_move(game_state *from, game_ui *ui,
* Drawing routines.
*/
* Drawing routines.
*/
-struct game_drawstate {
- int started;
- int w, h;
- unsigned char *visible;
-};
-
-static void game_size(game_params *params, int *x, int *y)
+static void game_size(game_params *params, game_drawstate *ds,
+ int *x, int *y, int expand)
{
{
+ int ts;
+
+ ts = min(GETTILESIZE(params->w, *x), GETTILESIZE(params->h, *y));
+ if (expand)
+ ds->tilesize = ts;
+ else
+ ds->tilesize = min(ts, PREFERRED_TILE_SIZE);
+
*x = SIZE(params->w);
*y = SIZE(params->h);
}
*x = SIZE(params->w);
*y = SIZE(params->h);
}
@@
-943,6
+953,7
@@
static game_drawstate *game_new_drawstate(game_state *state)
ds->w = state->w;
ds->h = state->h;
ds->visible = snewn(ds->w * ds->h, unsigned char);
ds->w = state->w;
ds->h = state->h;
ds->visible = snewn(ds->w * ds->h, unsigned char);
+ ds->tilesize = 0; /* not decided yet */
memset(ds->visible, 255, ds->w * ds->h);
return ds;
memset(ds->visible, 255, ds->w * ds->h);
return ds;
@@
-977,8
+988,8
@@
static void grid_square(frontend *fe, game_drawstate *ds,
}
static 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)
+
game_state *state, int dir, game_ui *ui,
+
float animtime, float flashtime)
{
int i, j;
int x1, x2, y1, y2;
{
int i, j;
int x1, x2, y1, y2;
@@
-1086,13
+1097,13
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
- game_state *newstate, int dir)
+ game_state *newstate, int dir
, game_ui *ui
)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate,
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate,
- game_state *newstate, int dir)
+ game_state *newstate, int dir
, game_ui *ui
)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->cheated && !newstate->cheated)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->cheated && !newstate->cheated)
@@
-1105,6
+1116,11
@@
static int game_wants_statusbar(void)
return FALSE;
}
return FALSE;
}
+static int game_timing_state(game_state *state)
+{
+ return TRUE;
+}
+
#ifdef COMBINED
#define thegame pattern
#endif
#ifdef COMBINED
#define thegame pattern
#endif
@@
-1129,6
+1145,7
@@
const struct game thegame = {
FALSE, game_text_format,
new_ui,
free_ui,
FALSE, game_text_format,
new_ui,
free_ui,
+ game_changed_state,
make_move,
game_size,
game_colours,
make_move,
game_size,
game_colours,
@@
-1138,6
+1155,8
@@
const struct game thegame = {
game_anim_length,
game_flash_length,
game_wants_statusbar,
game_anim_length,
game_flash_length,
game_wants_statusbar,
+ FALSE, game_timing_state,
+ 0, /* mouse_priorities */
};
#ifdef STANDALONE_SOLVER
};
#ifdef STANDALONE_SOLVER
@@
-1215,7
+1234,7
@@
int main(int argc, char **argv)
fprintf(stderr, "%s: %s\n", argv[0], err);
return 1;
}
fprintf(stderr, "%s: %s\n", argv[0], err);
return 1;
}
- s = new_game(p, desc);
+ s = new_game(
NULL,
p, desc);
{
int w = p->w, h = p->h, i, j, done_any, max;
{
int w = p->w, h = p->h, i, j, done_any, max;