~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ah, no, _that_ fixes the malloc problem. I'd forgotten that midend.c
[sgt/puzzles]
/
cube.c
diff --git
a/cube.c
b/cube.c
index
afd2ebd
..
145a1e5
100644
(file)
--- a/
cube.c
+++ b/
cube.c
@@
-11,9
+11,6
@@
#include "puzzles.h"
#include "puzzles.h"
-const char *const game_name = "Cube";
-const int game_can_configure = TRUE;
-
#define MAXVERTICES 20
#define MAXFACES 20
#define MAXORDER 4
#define MAXVERTICES 20
#define MAXFACES 20
#define MAXORDER 4
@@
-28,7
+25,7
@@
struct solid {
float border; /* border required around arena */
};
float border; /* border required around arena */
};
-static const struct solid tetrahedron = {
+static const struct solid
s_
tetrahedron = {
4,
{
0.0F, -0.57735026919F, -0.20412414523F,
4,
{
0.0F, -0.57735026919F, -0.20412414523F,
@@
-49,7
+46,7
@@
static const struct solid tetrahedron = {
0.0F, 0.3F
};
0.0F, 0.3F
};
-static const struct solid cube = {
+static const struct solid
s_
cube = {
8,
{
-0.5F,-0.5F,-0.5F, -0.5F,-0.5F,+0.5F,
8,
{
-0.5F,-0.5F,-0.5F, -0.5F,-0.5F,+0.5F,
@@
-69,7
+66,7
@@
static const struct solid cube = {
0.3F, 0.5F
};
0.3F, 0.5F
};
-static const struct solid octahedron = {
+static const struct solid
s_
octahedron = {
6,
{
-0.5F, -0.28867513459472505F, 0.4082482904638664F,
6,
{
-0.5F, -0.28867513459472505F, 0.4082482904638664F,
@@
-96,7
+93,7
@@
static const struct solid octahedron = {
0.0F, 0.5F
};
0.0F, 0.5F
};
-static const struct solid icosahedron = {
+static const struct solid
s_
icosahedron = {
12,
{
0.0F, 0.57735026919F, 0.75576131408F,
12,
{
0.0F, 0.57735026919F, 0.75576131408F,
@@
-148,7
+145,7
@@
enum {
TETRAHEDRON, CUBE, OCTAHEDRON, ICOSAHEDRON
};
static const struct solid *solids[] = {
TETRAHEDRON, CUBE, OCTAHEDRON, ICOSAHEDRON
};
static const struct solid *solids[] = {
- &
tetrahedron, &cube, &octahedron, &
icosahedron
+ &
s_tetrahedron, &s_cube, &s_octahedron, &s_
icosahedron
};
enum {
};
enum {
@@
-214,7
+211,7
@@
struct game_state {
int movecount;
};
int movecount;
};
-game_params *default_params(void)
+
static
game_params *default_params(void)
{
game_params *ret = snew(game_params);
{
game_params *ret = snew(game_params);
@@
-225,7
+222,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 = snew(game_params);
char *str;
{
game_params *ret = snew(game_params);
char *str;
@@
-265,19
+262,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();
@@
-298,7
+295,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];
@@
-476,7
+473,7
@@
static int grid_area(int d1, int d2, int order)
return d1*d1 + d2*d2 + 4*d1*d2;
}
return d1*d1 + d2*d2 + 4*d1*d2;
}
-config_item *game_configure(game_params *params)
+
static
config_item *game_configure(game_params *params)
{
config_item *ret = snewn(4, config_item);
char buf[80];
{
config_item *ret = snewn(4, config_item);
char buf[80];
@@
-506,7
+503,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);
@@
-532,7
+529,7
@@
static void count_grid_square_callback(void *ctx, struct grid_square *sq)
classes[thisclass]++;
}
classes[thisclass]++;
}
-char *validate_params(game_params *params)
+
static
char *validate_params(game_params *params)
{
int classes[5];
int i;
{
int classes[5];
int i;
@@
-592,7
+589,7
@@
static void classify_grid_square_callback(void *ctx, struct grid_square *sq)
data->squareindex++;
}
data->squareindex++;
}
-char *new_game_seed(game_params *params, random_state *rs)
+
static
char *new_game_seed(game_params *params, random_state *rs)
{
struct grid_data data;
int i, j, k, m, area, facesperclass;
{
struct grid_data data;
int i, j, k, m, area, facesperclass;
@@
-841,7
+838,7
@@
static struct solid *transform_poly(const struct solid *solid, int flip,
return ret;
}
return ret;
}
-char *validate_seed(game_params *params, char *seed)
+
static
char *validate_seed(game_params *params, char *seed)
{
int area = grid_area(params->d1, params->d2, solids[params->solid]->order);
int i, j;
{
int area = grid_area(params->d1, params->d2, solids[params->solid]->order);
int i, j;
@@
-869,7
+866,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 area;
{
game_state *state = snew(game_state);
int area;
@@
-948,7
+945,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);
@@
-977,21
+974,22
@@
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);
}
{
sfree(state);
}
-game_ui *new_ui(game_state *state)
+
static
game_ui *new_ui(game_state *state)
{
return NULL;
}
{
return NULL;
}
-void free_ui(game_ui *ui)
+
static
void free_ui(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 direction;
int pkey[2], skey[2], dkey[2];
{
int direction;
int pkey[2], skey[2], dkey[2];
@@
-1308,14
+1306,14
@@
static struct bbox find_bbox(game_params *params)
return bb;
}
return bb;
}
-void game_size(game_params *params, int *x, int *y)
+
static
void game_size(game_params *params, int *x, int *y)
{
struct bbox bb = find_bbox(params);
*x = (int)((bb.r - bb.l + 2*solids[params->solid]->border) * GRID_SCALE);
*y = (int)((bb.d - bb.u + 2*solids[params->solid]->border) * GRID_SCALE);
}
{
struct bbox bb = find_bbox(params);
*x = (int)((bb.r - bb.l + 2*solids[params->solid]->border) * GRID_SCALE);
*y = (int)((bb.d - bb.u + 2*solids[params->solid]->border) * GRID_SCALE);
}
-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);
@@
-1333,7
+1331,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);
struct bbox bb = find_bbox(&state->params);
{
struct game_drawstate *ds = snew(struct game_drawstate);
struct bbox bb = find_bbox(&state->params);
@@
-1344,13
+1342,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);
}
{
sfree(ds);
}
-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 i, j;
float animtime, float flashtime)
{
int i, j;
@@
-1365,13
+1363,15
@@
void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
draw_rect(fe, 0, 0, (int)((bb.r-bb.l+2.0F) * GRID_SCALE),
(int)((bb.d-bb.u+2.0F) * GRID_SCALE), COL_BACKGROUND);
draw_rect(fe, 0, 0, (int)((bb.r-bb.l+2.0F) * GRID_SCALE),
(int)((bb.d-bb.u+2.0F) * GRID_SCALE), COL_BACKGROUND);
- if (
oldstate && oldstate->movecount > state->movecount
) {
+ if (
dir < 0
) {
game_state *t;
/*
* This is an Undo. So reverse the order of the states, and
* run the roll timer backwards.
*/
game_state *t;
/*
* This is an Undo. So reverse the order of the states, and
* run the roll timer backwards.
*/
+ assert(oldstate);
+
t = oldstate;
oldstate = state;
state = t;
t = oldstate;
oldstate = state;
state = t;
@@
-1509,17
+1509,52
@@
void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
}
}
}
-float game_anim_length(game_state *oldstate, game_state *newstate)
+static float game_anim_length(game_state *oldstate,
+ game_state *newstate, int dir)
{
return ROLLTIME;
}
{
return ROLLTIME;
}
-float game_flash_length(game_state *oldstate, game_state *newstate)
+static float game_flash_length(game_state *oldstate,
+ game_state *newstate, int dir)
{
return 0.0F;
}
{
return 0.0F;
}
-int game_wants_statusbar(void)
+
static
int game_wants_statusbar(void)
{
return TRUE;
}
{
return TRUE;
}
+
+#ifdef COMBINED
+#define thegame cube
+#endif
+
+const struct game thegame = {
+ "Cube", "games.cube", 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,
+};