Right clicking on game area now shows the objective.

[rrace.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index ca03830545b7ee76392ce3087b66e8da9c417883..f7cc2bb706b519c7b4ed60b4f7ec1b29bcae6f6f 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -134,34 +134,28 @@ void game_reset(struct board *board)
        memset(board->goal, 0, sizeof board->goal);
 
        for (i = 0; i < 9; i++) {
-               uint_fast32_t position = board_position(i/3+1, i%3+1);
-
-               if (tiles[i] & 1)
-                       board->goal[0] |= position >> 6;
-               if (tiles[i] & 2)
-                       board->goal[1] |= position >> 6;
-               if (tiles[i] & 4)
-                       board->goal[2] |= position >> 6;
+               uint_fast32_t position = board_position(i/3+1, i%3+1) >> 6;
+
+               if (tiles[i] & 1) board->goal[0] |= position;
+               if (tiles[i] & 2) board->goal[1] |= position;
+               if (tiles[i] & 4) board->goal[2] |= position;
        }
 
        tiles[24] = TILE_EMPTY;
        shuffle(tiles, 25);
-       memset(board->game, 0, sizeof board->game);
 
+       memset(board->game, 0, sizeof board->game);
        for (i = 0; i < 25; i++) {
                unsigned x = i/5, y = i%5;
                uint_fast32_t position;
 
                position = board_position(x, y);
                if (tiles[i] != TILE_EMPTY) {
-                       if (tiles[i] & 1)
-                               board->game[0] |= position;
-                       if (tiles[i] & 2)
-                               board->game[1] |= position;
-                       if (tiles[i] & 4)
-                               board->game[2] |= position;
+                       if (tiles[i] & 1) board->game[0] |= position;
+                       if (tiles[i] & 2) board->game[1] |= position;
+                       if (tiles[i] & 4) board->game[2] |= position;
                } else {
-                       board->game[3] = 0x1ffffff ^ position;
+                       board->game[3] = ~position;
                        board->x = x;
                        board->y = y;
                }
@@ -197,8 +191,6 @@ int game_do_move(struct board *board, int x, int y)
        return 0;
 }
 
-#define GOAL_MASK 0x739c0
-
 int game_check_goal(struct board *board)
 {
        int i, ret = 1;