~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bah, and of course there's a TODO comment I forgot to remove.
[sgt/puzzles]
/
rect.c
diff --git
a/rect.c
b/rect.c
index
ab48e3c
..
e3914b0
100644
(file)
--- a/
rect.c
+++ b/
rect.c
@@
-39,10
+39,6
@@
#include "puzzles.h"
#include "puzzles.h"
-const char *const game_name = "Rectangles";
-const char *const game_winhelp_topic = "games.rectangles";
-const int game_can_configure = TRUE;
-
enum {
COL_BACKGROUND,
COL_CORRECT,
enum {
COL_BACKGROUND,
COL_CORRECT,
@@
-89,7
+85,7
@@
struct game_state {
int completed;
};
int completed;
};
-game_params *default_params(void)
+
static
game_params *default_params(void)
{
game_params *ret = snew(game_params);
{
game_params *ret = snew(game_params);
@@
-99,7
+95,7
@@
game_params *default_params(void)
return ret;
}
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)
{
game_params *ret;
int w, h;
{
game_params *ret;
int w, h;
@@
-122,19
+118,19
@@
int game_fetch_preset(int i, char **name, game_params **params)
return TRUE;
}
return TRUE;
}
-void free_params(game_params *params)
+
static
void free_params(game_params *params)
{
sfree(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 *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();
{
game_params *ret = default_params();
@@
-154,7
+150,7
@@
game_params *decode_params(char const *string)
return ret;
}
return ret;
}
-char *encode_params(game_params *params)
+
static
char *encode_params(game_params *params)
{
char data[256];
{
char data[256];
@@
-163,7
+159,7
@@
char *encode_params(game_params *params)
return dupstr(data);
}
return dupstr(data);
}
-config_item *game_configure(game_params *params)
+
static
config_item *game_configure(game_params *params)
{
config_item *ret;
char buf[80];
{
config_item *ret;
char buf[80];
@@
-196,7
+192,7
@@
config_item *game_configure(game_params *params)
return ret;
}
return ret;
}
-game_params *custom_params(config_item *cfg)
+
static
game_params *custom_params(config_item *cfg)
{
game_params *ret = snew(game_params);
{
game_params *ret = snew(game_params);
@@
-207,7
+203,7
@@
game_params *custom_params(config_item *cfg)
return ret;
}
return ret;
}
-char *validate_params(game_params *params)
+
static
char *validate_params(game_params *params)
{
if (params->w <= 0 && params->h <= 0)
return "Width and height must both be greater than zero";
{
if (params->w <= 0 && params->h <= 0)
return "Width and height must both be greater than zero";
@@
-390,7
+386,7
@@
static void display_grid(game_params *params, int *grid, int *numbers, int all)
}
#endif
}
#endif
-char *new_game_seed(game_params *params, random_state *rs)
+
static
char *new_game_seed(game_params *params, random_state *rs)
{
int *grid, *numbers;
struct rectlist *list;
{
int *grid, *numbers;
struct rectlist *list;
@@
-403,9
+399,9
@@
char *new_game_seed(game_params *params, random_state *rs)
* generate the base grid.
*/
params2->w = params->w / (1.0F + params->expandfactor);
* generate the base grid.
*/
params2->w = params->w / (1.0F + params->expandfactor);
- if (params2->w <
1) params2->w = 1
;
- params2->h = params->h
*
(1.0F + params->expandfactor);
- if (params2->h <
1) params2->h = 1
;
+ if (params2->w <
2 && params->w >= 2) params2->w = 2
;
+ params2->h = params->h
/
(1.0F + params->expandfactor);
+ if (params2->h <
2 && params->h >= 2) params2->h = 2
;
grid = snewn(params2->w * params2->h, int);
grid = snewn(params2->w * params2->h, int);
@@
-881,7
+877,13
@@
char *new_game_seed(game_params *params, random_state *rs)
run -= c - ('a' - 1);
}
} else {
run -= c - ('a' - 1);
}
} else {
- *p++ = '_';
+ /*
+ * If there's a number in the very top left or
+ * bottom right, there's no point putting an
+ * unnecessary _ before or after it.
+ */
+ if (p > seed && n > 0)
+ *p++ = '_';
}
if (n > 0)
p += sprintf(p, "%d", n);
}
if (n > 0)
p += sprintf(p, "%d", n);
@@
-896,7
+898,7
@@
char *new_game_seed(game_params *params, random_state *rs)
return seed;
}
return seed;
}
-char *validate_seed(game_params *params, char *seed)
+
static
char *validate_seed(game_params *params, char *seed)
{
int area = params->w * params->h;
int squares = 0;
{
int area = params->w * params->h;
int squares = 0;
@@
-924,7
+926,7
@@
char *validate_seed(game_params *params, char *seed)
return NULL;
}
return NULL;
}
-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 x, y, i, area;
{
game_state *state = snew(game_state);
int x, y, i, area;
@@
-967,7
+969,7
@@
game_state *new_game(game_params *params, char *seed)
return state;
}
return state;
}
-game_state *dup_game(game_state *state)
+
static
game_state *dup_game(game_state *state)
{
game_state *ret = snew(game_state);
{
game_state *ret = snew(game_state);
@@
-987,7
+989,7
@@
game_state *dup_game(game_state *state)
return ret;
}
return ret;
}
-void free_game(game_state *state)
+
static
void free_game(game_state *state)
{
sfree(state->grid);
sfree(state->vedge);
{
sfree(state->grid);
sfree(state->vedge);
@@
-1112,7
+1114,7
@@
struct game_ui {
int dragged;
};
int dragged;
};
-game_ui *new_ui(game_state *state)
+
static
game_ui *new_ui(game_state *state)
{
game_ui *ui = snew(game_ui);
ui->drag_start_x = -1;
{
game_ui *ui = snew(game_ui);
ui->drag_start_x = -1;
@@
-1123,12
+1125,12
@@
game_ui *new_ui(game_state *state)
return ui;
}
return ui;
}
-void free_ui(game_ui *ui)
+
static
void free_ui(game_ui *ui)
{
sfree(ui);
}
{
sfree(ui);
}
-void coord_round(float x, float y, int *xr, int *yr)
+
static
void coord_round(float x, float y, int *xr, int *yr)
{
float xs, ys, xv, yv, dx, dy, dist;
{
float xs, ys, xv, yv, dx, dy, dist;
@@
-1259,7
+1261,8
@@
static void ui_draw_rect(game_state *state, 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 xc, yc;
int startdrag = FALSE, enddrag = FALSE, active = FALSE;
{
int xc, yc;
int startdrag = FALSE, enddrag = FALSE, active = FALSE;
@@
-1368,13
+1371,13
@@
struct game_drawstate {
unsigned int *visible;
};
unsigned int *visible;
};
-void game_size(game_params *params, int *x, int *y)
+
static
void game_size(game_params *params, int *x, int *y)
{
*x = params->w * TILE_SIZE + 2*BORDER + 1;
*y = params->h * TILE_SIZE + 2*BORDER + 1;
}
{
*x = params->w * TILE_SIZE + 2*BORDER + 1;
*y = params->h * TILE_SIZE + 2*BORDER + 1;
}
-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);
{
float *ret = snewn(3 * NCOLOURS, float);
@@
-1404,7
+1407,7
@@
float *game_colours(frontend *fe, game_state *state, int *ncolours)
return ret;
}
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;
{
struct game_drawstate *ds = snew(struct game_drawstate);
int i;
@@
-1419,13
+1422,13
@@
game_drawstate *game_new_drawstate(game_state *state)
return ds;
}
return ds;
}
-void game_free_drawstate(game_drawstate *ds)
+
static
void game_free_drawstate(game_drawstate *ds)
{
sfree(ds->visible);
sfree(ds);
}
{
sfree(ds->visible);
sfree(ds);
}
-void draw_tile(frontend *fe, game_state *state, int x, int y,
+
static
void draw_tile(frontend *fe, game_state *state, int x, int y,
unsigned char *hedge, unsigned char *vedge,
unsigned char *corners, int correct)
{
unsigned char *hedge, unsigned char *vedge,
unsigned char *corners, int correct)
{
@@
-1481,8
+1484,8
@@
void draw_tile(frontend *fe, game_state *state, int x, int y,
draw_update(fe, cx, cy, TILE_SIZE+1, TILE_SIZE+1);
}
draw_update(fe, cx, cy, TILE_SIZE+1, TILE_SIZE+1);
}
-void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
- game_state *state, game_ui *ui,
+
static
void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
+ game_state *state,
int dir,
game_ui *ui,
float animtime, float flashtime)
{
int x, y;
float animtime, float flashtime)
{
int x, y;
@@
-1573,19
+1576,54
@@
void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
sfree(correct);
}
sfree(correct);
}
-float game_anim_length(game_state *oldstate, game_state *newstate)
+static float game_anim_length(game_state *oldstate,
+ game_state *newstate, int dir)
{
return 0.0F;
}
{
return 0.0F;
}
-float game_flash_length(game_state *oldstate, game_state *newstate)
+static float game_flash_length(game_state *oldstate,
+ game_state *newstate, int dir)
{
if (!oldstate->completed && newstate->completed)
return FLASH_TIME;
return 0.0F;
}
{
if (!oldstate->completed && newstate->completed)
return FLASH_TIME;
return 0.0F;
}
-int game_wants_statusbar(void)
+
static
int game_wants_statusbar(void)
{
return FALSE;
}
{
return FALSE;
}
+
+#ifdef COMBINED
+#define thegame rect
+#endif
+
+const struct game thegame = {
+ "Rectangles", "games.rectangles", 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,
+};