~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
min()/max() macros conflict with ones defined by Windows (or at least MinGW)
[sgt/puzzles]
/
pattern.c
diff --git
a/pattern.c
b/pattern.c
index
e09ed3d
..
f8e8fc5
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,
@@
-62,24
+59,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
+165,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
+470,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
+489,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
+595,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
+758,8
@@
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 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;
@@
-1086,13
+1079,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
+1098,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
@@
-1138,6
+1136,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
+1215,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;