~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bah. Try the r5766 fix again, this time without the typo.
[sgt/puzzles]
/
cube.c
diff --git
a/cube.c
b/cube.c
index
71c56d8
..
82901e5
100644
(file)
--- a/
cube.c
+++ b/
cube.c
@@
-25,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,
@@
-46,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,
@@
-66,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,
@@
-93,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,
@@
-145,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 {
@@
-589,7
+589,8
@@
static void classify_grid_square_callback(void *ctx, struct grid_square *sq)
data->squareindex++;
}
data->squareindex++;
}
-static char *new_game_seed(game_params *params, random_state *rs)
+static char *new_game_seed(game_params *params, random_state *rs,
+ game_aux_info **aux)
{
struct grid_data data;
int i, j, k, m, area, facesperclass;
{
struct grid_data data;
int i, j, k, m, area, facesperclass;
@@
-690,6
+691,11
@@
static char *new_game_seed(game_params *params, random_state *rs)
return seed;
}
return seed;
}
+static void game_free_aux_info(game_aux_info *aux)
+{
+ assert(!"Shouldn't happen");
+}
+
static void add_grid_square_callback(void *ctx, struct grid_square *sq)
{
game_state *state = (game_state *)ctx;
static void add_grid_square_callback(void *ctx, struct grid_square *sq)
{
game_state *state = (game_state *)ctx;
@@
-979,6
+985,17
@@
static void free_game(game_state *state)
sfree(state);
}
sfree(state);
}
+static game_state *solve_game(game_state *state, game_aux_info *aux,
+ char **error)
+{
+ return NULL;
+}
+
+static char *game_text_format(game_state *state)
+{
+ return NULL;
+}
+
static game_ui *new_ui(game_state *state)
{
return NULL;
static game_ui *new_ui(game_state *state)
{
return NULL;
@@
-1531,21
+1548,23
@@
static int game_wants_statusbar(void)
#endif
const struct game thegame = {
#endif
const struct game thegame = {
- "Cube", "games.cube",
TRUE,
+ "Cube", "games.cube",
default_params,
game_fetch_preset,
decode_params,
encode_params,
free_params,
dup_params,
default_params,
game_fetch_preset,
decode_params,
encode_params,
free_params,
dup_params,
- game_configure,
- custom_params,
+ TRUE, game_configure, custom_params,
validate_params,
new_game_seed,
validate_params,
new_game_seed,
+ game_free_aux_info,
validate_seed,
new_game,
dup_game,
free_game,
validate_seed,
new_game,
dup_game,
free_game,
+ FALSE, solve_game,
+ FALSE, game_text_format,
new_ui,
free_ui,
make_move,
new_ui,
free_ui,
make_move,