`Fifteen' was getting the parity wrong on any size of board where
[sgt/puzzles] / cube.c
diff --git a/cube.c b/cube.c
index 543e13b..c867471 100644 (file)
--- a/cube.c
+++ b/cube.c
@@ -10,6 +10,9 @@
 
 #include "puzzles.h"
 
+const char *const game_name = "Cube";
+const int game_can_configure = TRUE;
+
 #define MAXVERTICES 20
 #define MAXFACES 20
 #define MAXORDER 4
@@ -27,82 +30,86 @@ struct solid {
 static const struct solid tetrahedron = {
     4,
     {
-        0.0, -0.57735026919, -0.20412414523,
-        -0.5, 0.28867513459, -0.20412414523,
-        0.0, -0.0, 0.6123724357,
-        0.5, 0.28867513459, -0.20412414523,
+        0.0F, -0.57735026919F, -0.20412414523F,
+        -0.5F, 0.28867513459F, -0.20412414523F,
+        0.0F, -0.0F, 0.6123724357F,
+        0.5F, 0.28867513459F, -0.20412414523F,
     },
     3, 4,
     {
         0,2,1, 3,1,2, 2,0,3, 1,3,0
     },
     {
-        -0.816496580928, -0.471404520791, 0.333333333334,
-        0.0, 0.942809041583, 0.333333333333,
-        0.816496580928, -0.471404520791, 0.333333333334,
-        0.0, 0.0, -1.0,
+        -0.816496580928F, -0.471404520791F, 0.333333333334F,
+        0.0F, 0.942809041583F, 0.333333333333F,
+        0.816496580928F, -0.471404520791F, 0.333333333334F,
+        0.0F, 0.0F, -1.0F,
     },
-    0.0, 0.3
+    0.0F, 0.3F
 };
 
 static const struct solid cube = {
     8,
     {
-        -0.5,-0.5,-0.5, -0.5,-0.5,+0.5, -0.5,+0.5,-0.5, -0.5,+0.5,+0.5,
-        +0.5,-0.5,-0.5, +0.5,-0.5,+0.5, +0.5,+0.5,-0.5, +0.5,+0.5,+0.5,
+        -0.5F,-0.5F,-0.5F, -0.5F,-0.5F,+0.5F,
+       -0.5F,+0.5F,-0.5F, -0.5F,+0.5F,+0.5F,
+        +0.5F,-0.5F,-0.5F, +0.5F,-0.5F,+0.5F,
+       +0.5F,+0.5F,-0.5F, +0.5F,+0.5F,+0.5F,
     },
     4, 6,
     {
         0,1,3,2, 1,5,7,3, 5,4,6,7, 4,0,2,6, 0,4,5,1, 3,7,6,2
     },
     {
-        -1,0,0, 0,0,+1, +1,0,0, 0,0,-1, 0,-1,0, 0,+1,0
+        -1.0F,0.0F,0.0F, 0.0F,0.0F,+1.0F,
+       +1.0F,0.0F,0.0F, 0.0F,0.0F,-1.0F,
+       0.0F,-1.0F,0.0F, 0.0F,+1.0F,0.0F
     },
-    0.3, 0.5
+    0.3F, 0.5F
 };
 
 static const struct solid octahedron = {
     6,
     {
-        -0.5, -0.28867513459472505, 0.4082482904638664,
-        0.5, 0.28867513459472505, -0.4082482904638664,
-        -0.5, 0.28867513459472505, -0.4082482904638664,
-        0.5, -0.28867513459472505, 0.4082482904638664,
-        0.0, -0.57735026918945009, -0.4082482904638664,
-        0.0, 0.57735026918945009, 0.4082482904638664,
+        -0.5F, -0.28867513459472505F, 0.4082482904638664F,
+        0.5F, 0.28867513459472505F, -0.4082482904638664F,
+        -0.5F, 0.28867513459472505F, -0.4082482904638664F,
+        0.5F, -0.28867513459472505F, 0.4082482904638664F,
+        0.0F, -0.57735026918945009F, -0.4082482904638664F,
+        0.0F, 0.57735026918945009F, 0.4082482904638664F,
     },
     3, 8,
     {
         4,0,2, 0,5,2, 0,4,3, 5,0,3, 1,4,2, 5,1,2, 4,1,3, 1,5,3
     },
     {
-        -0.816496580928, -0.471404520791, -0.333333333334,
-        -0.816496580928, 0.471404520791, 0.333333333334,
-        0.0, -0.942809041583, 0.333333333333,
-        0.0, 0.0, 1.0,
-        0.0, 0.0, -1.0,
-        0.0, 0.942809041583, -0.333333333333,
-        0.816496580928, -0.471404520791, -0.333333333334,
-        0.816496580928, 0.471404520791, 0.333333333334,
+        -0.816496580928F, -0.471404520791F, -0.333333333334F,
+        -0.816496580928F, 0.471404520791F, 0.333333333334F,
+        0.0F, -0.942809041583F, 0.333333333333F,
+        0.0F, 0.0F, 1.0F,
+        0.0F, 0.0F, -1.0F,
+        0.0F, 0.942809041583F, -0.333333333333F,
+        0.816496580928F, -0.471404520791F, -0.333333333334F,
+        0.816496580928F, 0.471404520791F, 0.333333333334F,
     },
-    0.0, 0.5
+    0.0F, 0.5F
 };
 
 static const struct solid icosahedron = {
     12,
     {
-        0.0, 0.57735026919, 0.75576131408,
-        0.0, -0.93417235896, 0.17841104489,
-        0.0, 0.93417235896, -0.17841104489,
-        0.0, -0.57735026919, -0.75576131408,
-        -0.5, -0.28867513459, 0.75576131408,
-        -0.5, 0.28867513459, -0.75576131408,
-        0.5, -0.28867513459, 0.75576131408,
-        0.5, 0.28867513459, -0.75576131408,
-        -0.80901699437, 0.46708617948, 0.17841104489,
-        0.80901699437, 0.46708617948, 0.17841104489,
-        -0.80901699437, -0.46708617948, -0.17841104489,
-        0.80901699437, -0.46708617948, -0.17841104489,
+        0.0F, 0.57735026919F, 0.75576131408F,
+        0.0F, -0.93417235896F, 0.17841104489F,
+        0.0F, 0.93417235896F, -0.17841104489F,
+        0.0F, -0.57735026919F, -0.75576131408F,
+        -0.5F, -0.28867513459F, 0.75576131408F,
+        -0.5F, 0.28867513459F, -0.75576131408F,
+        0.5F, -0.28867513459F, 0.75576131408F,
+        0.5F, 0.28867513459F, -0.75576131408F,
+        -0.80901699437F, 0.46708617948F, 0.17841104489F,
+        0.80901699437F, 0.46708617948F, 0.17841104489F,
+        -0.80901699437F, -0.46708617948F, -0.17841104489F,
+        0.80901699437F, -0.46708617948F, -0.17841104489F,
     },
     3, 20,
     {
@@ -112,28 +119,28 @@ static const struct solid icosahedron = {
         1,11,6, 8,2,5,  2,9,7,  3,10,5, 11,3,7,
     },
     {
-        -0.356822089773, 0.87267799625, 0.333333333333,
-        0.356822089773, 0.87267799625, 0.333333333333,
-        -0.356822089773, -0.87267799625, -0.333333333333,
-        0.356822089773, -0.87267799625, -0.333333333333,
-        -0.0, 0.0, 1.0,
-        0.0, -0.666666666667, 0.745355992501,
-        0.0, 0.666666666667, -0.745355992501,
-        0.0, 0.0, -1.0,
-        -0.934172358963, -0.12732200375, 0.333333333333,
-        -0.934172358963, 0.12732200375, -0.333333333333,
-        0.934172358963, -0.12732200375, 0.333333333333,
-        0.934172358963, 0.12732200375, -0.333333333333,
-        -0.57735026919, 0.333333333334, 0.745355992501,
-        0.57735026919, 0.333333333334, 0.745355992501,
-        -0.57735026919, -0.745355992501, 0.333333333334,
-        0.57735026919, -0.745355992501, 0.333333333334,
-        -0.57735026919, 0.745355992501, -0.333333333334,
-        0.57735026919, 0.745355992501, -0.333333333334,
-        -0.57735026919, -0.333333333334, -0.745355992501,
-        0.57735026919, -0.333333333334, -0.745355992501,
+        -0.356822089773F, 0.87267799625F, 0.333333333333F,
+        0.356822089773F, 0.87267799625F, 0.333333333333F,
+        -0.356822089773F, -0.87267799625F, -0.333333333333F,
+        0.356822089773F, -0.87267799625F, -0.333333333333F,
+        -0.0F, 0.0F, 1.0F,
+        0.0F, -0.666666666667F, 0.745355992501F,
+        0.0F, 0.666666666667F, -0.745355992501F,
+        0.0F, 0.0F, -1.0F,
+        -0.934172358963F, -0.12732200375F, 0.333333333333F,
+        -0.934172358963F, 0.12732200375F, -0.333333333333F,
+        0.934172358963F, -0.12732200375F, 0.333333333333F,
+        0.934172358963F, 0.12732200375F, -0.333333333333F,
+        -0.57735026919F, 0.333333333334F, 0.745355992501F,
+        0.57735026919F, 0.333333333334F, 0.745355992501F,
+        -0.57735026919F, -0.745355992501F, 0.333333333334F,
+        0.57735026919F, -0.745355992501F, 0.333333333334F,
+        -0.57735026919F, 0.745355992501F, -0.333333333334F,
+        0.57735026919F, 0.745355992501F, -0.333333333334F,
+        -0.57735026919F, -0.333333333334F, -0.745355992501F,
+        0.57735026919F, -0.333333333334F, -0.745355992501F,
     },
-    0.0, 0.8
+    0.0F, 0.8F
 };
 
 enum {
@@ -152,8 +159,8 @@ enum {
 
 enum { LEFT, RIGHT, UP, DOWN, UP_LEFT, UP_RIGHT, DOWN_LEFT, DOWN_RIGHT };
 
-#define GRID_SCALE 48
-#define ROLLTIME 0.1
+#define GRID_SCALE 48.0F
+#define ROLLTIME 0.1F
 
 #define SQ(x) ( (x) * (x) )
 
@@ -232,8 +239,8 @@ int game_fetch_preset(int i, char **name, game_params **params)
       case 1:
         str = "Tetrahedron";
         ret->solid = TETRAHEDRON;
-        ret->d1 = 2;
-        ret->d2 = 1;
+        ret->d1 = 1;
+        ret->d2 = 2;
         break;
       case 2:
         str = "Octahedron";
@@ -282,16 +289,16 @@ static void enum_grid_squares(game_params *params,
             for (y = 0; y < params->d2; y++) {
                 struct grid_square sq;
 
-                sq.x = x;
-                sq.y = y;
-                sq.points[0] = x - 0.5;
-                sq.points[1] = y - 0.5;
-                sq.points[2] = x - 0.5;
-                sq.points[3] = y + 0.5;
-                sq.points[4] = x + 0.5;
-                sq.points[5] = y + 0.5;
-                sq.points[6] = x + 0.5;
-                sq.points[7] = y - 0.5;
+                sq.x = (float)x;
+                sq.y = (float)y;
+                sq.points[0] = x - 0.5F;
+                sq.points[1] = y - 0.5F;
+                sq.points[2] = x - 0.5F;
+                sq.points[3] = y + 0.5F;
+                sq.points[4] = x + 0.5F;
+                sq.points[5] = y + 0.5F;
+                sq.points[6] = x + 0.5F;
+                sq.points[7] = y - 0.5F;
                 sq.npoints = 4;
 
                 sq.directions[LEFT]  = 0x03;   /* 0,1 */
@@ -315,15 +322,15 @@ static void enum_grid_squares(game_params *params,
             }
     } else {
         int row, rowlen, other, i, firstix = -1;
-        float theight = sqrt(3) / 2.0;
+        float theight = (float)(sqrt(3) / 2.0);
 
         for (row = 0; row < params->d1 + params->d2; row++) {
-            if (row < params->d1) {
+            if (row < params->d2) {
                 other = +1;
-                rowlen = row + params->d2;
+                rowlen = row + params->d1;
             } else {
                 other = -1;
-                rowlen = 2*params->d1 + params->d2 - row;
+                rowlen = 2*params->d2 + params->d1 - row;
             }
 
             /*
@@ -335,15 +342,15 @@ static void enum_grid_squares(game_params *params,
                 float x, y;
 
                 ix = (2 * i - (rowlen-1));
-                x = ix * 0.5;
+                x = ix * 0.5F;
                 y = theight * row;
                 sq.x = x;
                 sq.y = y + theight / 3;
-                sq.points[0] = x - 0.5;
+                sq.points[0] = x - 0.5F;
                 sq.points[1] = y;
                 sq.points[2] = x;
                 sq.points[3] = y + theight;
-                sq.points[4] = x + 0.5;
+                sq.points[4] = x + 0.5F;
                 sq.points[5] = y;
                 sq.npoints = 3;
 
@@ -380,15 +387,15 @@ static void enum_grid_squares(game_params *params,
                 float x, y;
 
                 ix = (2 * i - (rowlen+other-1));
-                x = ix * 0.5;
+                x = ix * 0.5F;
                 y = theight * row;
                 sq.x = x;
                 sq.y = y + 2*theight / 3;
-                sq.points[0] = x + 0.5;
+                sq.points[0] = x + 0.5F;
                 sq.points[1] = y + theight;
                 sq.points[2] = x;
                 sq.points[3] = y;
-                sq.points[4] = x - 0.5;
+                sq.points[4] = x - 0.5F;
                 sq.points[5] = y + theight;
                 sq.npoints = 3;
 
@@ -409,7 +416,7 @@ static void enum_grid_squares(game_params *params,
                 sq.flip = FALSE;
 
                 if (firstix < 0)
-                    firstix = ix;
+                    firstix = (ix - 1) & 3;
                 ix -= firstix;
                 sq.tetra_class = ((row+(ix&1)) & 2) ^ (ix & 3);
 
@@ -437,6 +444,99 @@ static int grid_area(int d1, int d2, int order)
         return d1*d1 + d2*d2 + 4*d1*d2;
 }
 
+config_item *game_configure(game_params *params)
+{
+    config_item *ret = snewn(4, config_item);
+    char buf[80];
+
+    ret[0].name = "Type of solid";
+    ret[0].type = C_CHOICES;
+    ret[0].sval = ":Tetrahedron:Cube:Octahedron:Icosahedron";
+    ret[0].ival = params->solid;
+
+    ret[1].name = "Width / top";
+    ret[1].type = C_STRING;
+    sprintf(buf, "%d", params->d1);
+    ret[1].sval = dupstr(buf);
+    ret[1].ival = 0;
+
+    ret[2].name = "Height / bottom";
+    ret[2].type = C_STRING;
+    sprintf(buf, "%d", params->d2);
+    ret[2].sval = dupstr(buf);
+    ret[2].ival = 0;
+
+    ret[3].name = NULL;
+    ret[3].type = C_END;
+    ret[3].sval = NULL;
+    ret[3].ival = 0;
+
+    return ret;
+}
+
+game_params *custom_params(config_item *cfg)
+{
+    game_params *ret = snew(game_params);
+
+    ret->solid = cfg[0].ival;
+    ret->d1 = atoi(cfg[1].sval);
+    ret->d2 = atoi(cfg[2].sval);
+
+    return ret;
+}
+
+static void count_grid_square_callback(void *ctx, struct grid_square *sq)
+{
+    int *classes = (int *)ctx;
+    int thisclass;
+
+    if (classes[4] == 4)
+       thisclass = sq->tetra_class;
+    else if (classes[4] == 2)
+       thisclass = sq->flip;
+    else
+       thisclass = 0;
+
+    classes[thisclass]++;
+}
+
+char *validate_params(game_params *params)
+{
+    int classes[5];
+    int i;
+
+    if (params->solid < 0 || params->solid >= lenof(solids))
+       return "Unrecognised solid type";
+
+    if (solids[params->solid]->order == 4) {
+       if (params->d1 <= 0 || params->d2 <= 0)
+           return "Both grid dimensions must be greater than zero";
+    } else {
+       if (params->d1 <= 0 && params->d2 <= 0)
+           return "At least one grid dimension must be greater than zero";
+    }
+
+    for (i = 0; i < 4; i++)
+       classes[i] = 0;
+    if (params->solid == TETRAHEDRON)
+       classes[4] = 4;
+    else if (params->solid == OCTAHEDRON)
+       classes[4] = 2;
+    else
+       classes[4] = 1;
+    enum_grid_squares(params, count_grid_square_callback, classes);
+
+    for (i = 0; i < classes[4]; i++)
+       if (classes[i] < solids[params->solid]->nfaces / classes[4])
+           return "Not enough grid space to place all blue faces";
+
+    if (grid_area(params->d1, params->d2, solids[params->solid]->order) <
+       solids[params->solid]->nfaces + 1)
+       return "Not enough space to place the solid on an empty square";
+
+    return NULL;
+}
+
 struct grid_data {
     int *gridptrs[4];
     int nsquares[4];
@@ -505,15 +605,7 @@ char *new_game_seed(game_params *params)
 
     for (i = 0; i < data.nclasses; i++) {
        for (j = 0; j < facesperclass; j++) {
-           unsigned long divisor = RAND_MAX / data.nsquares[i];
-           unsigned long max = divisor * data.nsquares[i];
-           int n;
-
-           do {
-               n = rand();
-           } while (n >= max);
-
-           n /= divisor;
+            int n = rand_upto(data.nsquares[i]);
 
            assert(!flags[data.gridptrs[i][n]]);
            flags[data.gridptrs[i][n]] = TRUE;
@@ -561,19 +653,7 @@ char *new_game_seed(game_params *params)
     /*
      * Choose a non-blue square for the polyhedron.
      */
-    {
-       unsigned long divisor = RAND_MAX / m;
-       unsigned long max = divisor * m;
-       int n;
-
-       do {
-           n = rand();
-       } while (n >= max);
-
-       n /= divisor;
-
-       sprintf(p, ":%d", data.gridptrs[0][n]);
-    }
+    sprintf(p, ":%d", data.gridptrs[0][rand_upto(m)]);
 
     sfree(data.gridptrs[0]);
     sfree(flags);
@@ -704,8 +784,8 @@ static struct solid *transform_poly(const struct solid *solid, int flip,
     vmatrix[1] = -vy; vmatrix[4] = vx; vmatrix[7] = 0;
     vmatrix[2] =   0; vmatrix[5] =  0; vmatrix[8] = 1;
 
-    ax = cos(angle);
-    ay = sin(angle);
+    ax = (float)cos(angle);
+    ay = (float)sin(angle);
 
     amatrix[0] = 1; amatrix[3] =   0; amatrix[6] =  0;
     amatrix[1] = 0; amatrix[4] =  ax; amatrix[7] = ay;
@@ -802,7 +882,7 @@ game_state *new_game(game_params *params, char *seed)
 
     state->previous = state->current;
     state->angle = 0.0;
-    state->completed = FALSE;
+    state->completed = 0;
     state->movecount = 0;
 
     return state;
@@ -972,7 +1052,7 @@ game_state *make_move(game_state *from, int x, int y, int button)
         for (i = 0; i < 3; i++)
             dp += (from->solid->normals[f[0]*3+i] *
                    from->solid->normals[f[1]*3+i]);
-        angle = acos(dp);
+        angle = (float)acos(dp);
     }
 
     /*
@@ -1060,6 +1140,8 @@ game_state *make_move(game_state *from, int x, int y, int button)
         ret->facecolours = newcolours;
     }
 
+    ret->movecount++;
+
     /*
      * And finally, swap the colour between the bottom face of the
      * polyhedron and the face we've just landed on.
@@ -1082,7 +1164,7 @@ game_state *make_move(game_state *from, int x, int y, int button)
             if (ret->facecolours[i])
                 j++;
         if (j == ret->solid->nfaces)
-            ret->completed = TRUE;
+            ret->completed = ret->movecount;
     }
 
     sfree(poly);
@@ -1111,7 +1193,6 @@ game_state *make_move(game_state *from, int x, int y, int button)
     ret->sgkey[1] = skey[1];
     ret->previous = from->current;
     ret->angle = angle;
-    ret->movecount++;
 
     return ret;
 }
@@ -1149,10 +1230,10 @@ static struct bbox find_bbox(game_params *params)
      * These should be hugely more than the real bounding box will
      * be.
      */
-    bb.l = 2 * (params->d1 + params->d2);
-    bb.r = -2 * (params->d1 + params->d2);
-    bb.u = 2 * (params->d1 + params->d2);
-    bb.d = -2 * (params->d1 + params->d2);
+    bb.l = 2.0F * (params->d1 + params->d2);
+    bb.r = -2.0F * (params->d1 + params->d2);
+    bb.u = 2.0F * (params->d1 + params->d2);
+    bb.d = -2.0F * (params->d1 + params->d2);
     enum_grid_squares(params, find_bbox_callback, &bb);
 
     return bb;
@@ -1161,8 +1242,8 @@ static struct bbox find_bbox(game_params *params)
 void game_size(game_params *params, int *x, int *y)
 {
     struct bbox bb = find_bbox(params);
-    *x = (bb.r - bb.l + 2*solids[params->solid]->border) * GRID_SCALE;
-    *y = (bb.d - bb.u + 2*solids[params->solid]->border) * GRID_SCALE;
+    *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)
@@ -1188,8 +1269,8 @@ game_drawstate *game_new_drawstate(game_state *state)
     struct game_drawstate *ds = snew(struct game_drawstate);
     struct bbox bb = find_bbox(&state->params);
 
-    ds->ox = -(bb.l - state->solid->border) * GRID_SCALE;
-    ds->oy = -(bb.u - state->solid->border) * GRID_SCALE;
+    ds->ox = (int)(-(bb.l - state->solid->border) * GRID_SCALE);
+    ds->oy = (int)(-(bb.u - state->solid->border) * GRID_SCALE);
 
     return ds;
 }
@@ -1200,7 +1281,7 @@ void game_free_drawstate(game_drawstate *ds)
 }
 
 void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
-                 game_state *state, float animtime)
+                 game_state *state, float animtime, float flashtime)
 {
     int i, j;
     struct bbox bb = find_bbox(&state->params);
@@ -1211,8 +1292,8 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
     game_state *newstate;
     int square;
 
-    draw_rect(fe, 0, 0, (bb.r-bb.l+2) * GRID_SCALE,
-              (bb.d-bb.u+2) * 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) {
         game_state *t;
@@ -1247,10 +1328,10 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
         int coords[8];
 
         for (j = 0; j < state->squares[i].npoints; j++) {
-            coords[2*j] = state->squares[i].points[2*j]
-                * GRID_SCALE + ds->ox;
-            coords[2*j+1] = state->squares[i].points[2*j+1]
-                * GRID_SCALE + ds->oy;
+            coords[2*j] = ((int)(state->squares[i].points[2*j] * GRID_SCALE)
+                          + ds->ox);
+            coords[2*j+1] = ((int)(state->squares[i].points[2*j+1]*GRID_SCALE)
+                            + ds->oy);
         }
 
         draw_polygon(fe, coords, state->squares[i].npoints, TRUE,
@@ -1307,8 +1388,8 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
         }
 
         for (j = 0; j < poly->order; j++) {
-            coords[j*2] = points[j*2] * GRID_SCALE + ds->ox;
-            coords[j*2+1] = points[j*2+1] * GRID_SCALE + ds->oy;
+            coords[j*2] = (int)floor(points[j*2] * GRID_SCALE) + ds->ox;
+            coords[j*2+1] = (int)floor(points[j*2+1] * GRID_SCALE) + ds->oy;
         }
 
         /*
@@ -1341,11 +1422,34 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
     }
     sfree(poly);
 
-    draw_update(fe, 0, 0, (bb.r-bb.l+2) * GRID_SCALE,
-                (bb.d-bb.u+2) * GRID_SCALE);
+    draw_update(fe, 0, 0, (int)((bb.r-bb.l+2.0F) * GRID_SCALE),
+                (int)((bb.d-bb.u+2.0F) * GRID_SCALE));
+
+    /*
+     * Update the status bar.
+     */
+    {
+       char statusbuf[256];
+
+       sprintf(statusbuf, "%sMoves: %d",
+               (state->completed ? "COMPLETED! " : ""),
+               (state->completed ? state->completed : state->movecount));
+
+       status_bar(fe, statusbuf);
+    }
 }
 
 float game_anim_length(game_state *oldstate, game_state *newstate)
 {
     return ROLLTIME;
 }
+
+float game_flash_length(game_state *oldstate, game_state *newstate)
+{
+    return 0.0F;
+}
+
+int game_wants_statusbar(void)
+{
+    return TRUE;
+}