diff options
| author | Simon Tatham <anakin@pobox.com> | 2005-01-22 15:29:01 +0000 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2005-01-22 15:29:01 +0000 |
| commit | a99de1be8f01f619b965e446ff4ff85d4324f487 (patch) | |
| tree | 2f0aee8aa63600252568868f46422a2576ce76f2 /cube.c | |
| parent | cc545532268b04e05005bf65f53f0a1ba39335ba (diff) | |
| download | puzzles-a99de1be8f01f619b965e446ff4ff85d4324f487.zip puzzles-a99de1be8f01f619b965e446ff4ff85d4324f487.tar.gz puzzles-a99de1be8f01f619b965e446ff4ff85d4324f487.tar.bz2 puzzles-a99de1be8f01f619b965e446ff4ff85d4324f487.tar.xz | |
Arrange that we really _can_ compile all the puzzles into a single
binary if we choose: fix bugs in cube.c and sixteen.c that manifest
when compiled that way, and introduce list.c which provides a global
list of all the available puzzles.
[originally from svn r5169]
Diffstat (limited to 'cube.c')
| -rw-r--r-- | cube.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -25,7 +25,7 @@ struct solid { float border; /* border required around arena */ }; -static const struct solid tetrahedron = { +static const struct solid s_tetrahedron = { 4, { 0.0F, -0.57735026919F, -0.20412414523F, @@ -46,7 +46,7 @@ static const struct solid tetrahedron = { 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, @@ -66,7 +66,7 @@ static const struct solid cube = { 0.3F, 0.5F }; -static const struct solid octahedron = { +static const struct solid s_octahedron = { 6, { -0.5F, -0.28867513459472505F, 0.4082482904638664F, @@ -93,7 +93,7 @@ static const struct solid octahedron = { 0.0F, 0.5F }; -static const struct solid icosahedron = { +static const struct solid s_icosahedron = { 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 + &s_tetrahedron, &s_cube, &s_octahedron, &s_icosahedron }; enum { |