Restructure icon rebuild rules a bit.

[rrace.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 301dfac022c87681b9be53b88f96bc91dd1b01b0..958cc60f94168489d966fc5ff21466d93c7ff2df 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -20,6 +20,7 @@
 #define RRACE_GAME_H_
 
 #include <inttypes.h>
+#include <xtime.h>
 
 enum {
        TILE_EMPTY,
@@ -32,7 +33,9 @@ enum {
        TILE_MAX
 };
 
-enum { GOAL_SHIFT = 6 };
+#define GOAL_SHIFT 6
+#define GOAL_MASK 0x739c0ul
+
 struct board {
        /*
         * Bit planes representing the current game area.
@@ -63,8 +66,10 @@ struct board {
         */
        uint_least16_t goal[3];
 
-       /* (x, y) position of the current empty position. */
+       /* (x, y) position of the current empty space. */
        uint_least8_t x, y;
+
+       xtime_t time_start;
 };
 
 /* Return the board bitmap with all bits in column x set */
@@ -156,14 +161,16 @@ static inline uint_fast32_t board_right(int x)
  * and update the location of the empty position which, if the move was valid
  * is now (x, y).
  *
- * Returns 0 if the move was valid (and board has been updated), -1 otherwise.
+ * Returns the board bitmap indicating which positions changed.  A return
+ * value of 0 therefore indicates an invalid move.
  */
-int game_do_move(struct board *board, int x, int y);
+uint_fast32_t game_do_move(struct board *board, int x, int y);
 
 /*
- * Returns 1 if the game is in a winning position, or 0 otherwise.
+ * Returns the board bitmap setting game locations that differ from the goal.
+ * A return value of 0 therefore indicates a winning position.
  */
-int game_check_goal(struct board *board);
+uint_fast32_t game_check_goal(struct board *board);
 
 /*
  * Initialize the game RNG such that the next call to game_reset will produce a
@@ -176,9 +183,20 @@ void game_reseed(unsigned long long seed);
  */
 void game_reset(struct board *board);
 
+/*
+ * Reset the game start time.
+ */
+void game_begin(struct board *board);
+
+/*
+ * Return the total elapsed time (in ms) since the last call to game_begin.
+ */
+int_fast32_t game_elapsed(struct board *board);
+
 /*
  * Disable new moves and clear all tile bits other than the 9 goal tiles.
+ * Returns the total elapsed time (in ms).
  */
-void game_finish(struct board *board);
+int_fast32_t game_finish(struct board *board);
 
 #endif