Fixed issue with multiple variations

jean-bovet · May 8, 2021 · 69d1b4a · 69d1b4a
1 parent 7355656
commit 69d1b4a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/BChessTests/PGNTests.cpp b/BChessTests/PGNTests.cpp
@@ -296,7 +296,7 @@ TEST_F(PGN, PGNWithVariation2) {
     ChessGame game;
     ASSERT_TRUE(FPGN::setGame(pgn, game));
 
-    ASSERT_EQ(12, game.getNumberOfMoves());
+    ASSERT_EQ(3, game.getNumberOfMoves());
 
     auto pgnAgain = FPGN::getGame(game);
     ASSERT_EQ("1. e4 e5 2. Nc3 (2. Nf3 Nc6 3. Nc3 Nf6) *", pgnAgain);

diff --git a/Shared/Engine/Engine/ChessGame.cpp b/Shared/Engine/Engine/ChessGame.cpp
@@ -79,8 +79,7 @@ void ChessGame::move(Move move, bool replace) {
             // the player is playing a series of move that correspond to that PGN.
             for (int index=0; index<node.variations.size(); index++) {
                 if (node.variations[index].move == move) {
-                    moveIndexes.moves.push_back(index);
-                    moveIndexes.moveCursor++;
+                    moveIndexes.add(index);
                     found = true;
                     break;
                 }
@@ -95,8 +94,7 @@ void ChessGame::move(Move move, bool replace) {
             node.variations.push_back(newNode);
 
             // Insert the index of that new variation to the current move indexes
-            moveIndexes.moves.push_back((int)node.variations.size() - 1);
-            moveIndexes.moveCursor++;
+            moveIndexes.add((int)node.variations.size() - 1);
         }
     });
 

diff --git a/Shared/Engine/Engine/ChessGame.hpp b/Shared/Engine/Engine/ChessGame.hpp
@@ -32,6 +32,15 @@ class ChessGame {
         // The current index in the index of moves above
         int moveCursor = 0;
 
+        void add(int move) {
+            if (moveCursor < moves.size()) {
+                moves[moveCursor] = move;
+            } else {
+                moves.push_back(move);
+            }
+            moveCursor++;
+        }
+
         void reset() {
             moveCursor = 0;
             moves.clear();
@@ -110,7 +119,7 @@ class ChessGame {
 
     void setMoveIndexes(MoveIndexes indexes) {
         moveIndexes = indexes;
-
+                
         // Always replay the moves to update the internal
         // board state when the move indexes change,
         // because that means we are starting at another