Improve exposure mask calculation.

[rrace.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index a734e229058f5182f96c28c3512c19c06fec6965..7640b415d0bd6aba2c67f98bd3692439f556c43c 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -121,9 +121,7 @@ static inline uint_fast32_t board_mask_v(int x, int y0, int y1)
  */
 static inline uint_fast32_t board_above(int y)
 {
-       uint_fast32_t val = board_row(y);
-
-       return val | (val-1);
+       return ( 0x20ul << 5*y ) - 1;
 }
 
 /*
@@ -131,9 +129,7 @@ static inline uint_fast32_t board_above(int y)
  */
 static inline uint_fast32_t board_below(int y)
 {
-       uint_fast32_t val = board_row(y);
-
-       return val | (~val + 1);
+       return ~( 1ul << 5*y ) + 1;
 }
 
 /*
@@ -156,14 +152,30 @@ static inline uint_fast32_t board_right(int x)
        return ~val + 0x108421;
 }
 
+/*
+ * Return the board bitmap setting the rectangle of locations that are:
+ *
+ *   - on or right of column x1, and
+ *   - on or left of column x2, and
+ *   - on or below row y1, and
+ *   - on or above row y2.
+ *
+ * It must be the case that x2 >= x1 and y2 >= y1.
+ */
+static inline uint_fast32_t board_rect(int x1, int y1, int x2, int y2)
+{
+       return (board_left(x2-x1) << x1) & (board_above(y2-y1) << 5*y1);
+}
+
 /*
  * Move the bits in the game bitmaps according to a move at position (x, y),
  * 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 the board bitmap setting game locations that differ from the goal.
@@ -187,6 +199,11 @@ void game_reset(struct board *board);
  */
 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).