Bugfix: Move Number in starting positions is not used

Isarhamster · Nov 30, 2024 · bff0ca5 · bff0ca5
1 parent 68d21c1
commit bff0ca5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/src/database/gamecursor.cpp b/src/database/gamecursor.cpp
@@ -69,7 +69,8 @@ GameCursor::~GameCursor()
 
 void GameCursor::initCursor()
 {
-    m_nodes.append(Node());
+    Node n = Node();
+    m_nodes.append(n);
     if (m_currentBoard)
     {
         m_currentNode = ROOT_NODE;
@@ -103,7 +104,7 @@ void GameCursor::clear(const QString& fen, bool chess960)
     m_nodes.clear();
     m_startingBoard.setChess960(chess960);
     m_startingBoard.fromFen(fen);
-    m_startPly = (m_startingBoard.moveNumber() - 1) * 2 + (m_startingBoard.toMove() == Black);
+    m_startPly = (m_startingBoard.moveNumber()) * 2 - 1 + ((m_startingBoard.toMove() == Black) ? 1:0);
     initCursor();
 }
 
@@ -210,7 +211,7 @@ bool GameCursor::atLineEnd(MoveId moveId) const
     MoveId node = makeNodeIndex(moveId);
     if (node == NO_MOVE)
     {
-        return false;
+        node = ROOT_NODE;
     }
     return m_nodes[node].nextNode == NO_MOVE;
 }
@@ -255,11 +256,8 @@ int GameCursor::moveNumber(MoveId moveId) const
     MoveId node = makeNodeIndex(moveId);
     if(node != NO_MOVE)
     {
-        if(int plyNum = plyNumber(node))
-        {
-            return (m_startPly + plyNum - 1) / 2 + 1;
-        }
-        return 0;
+        int plyNum = plyNumber(node);
+        return (m_startPly + plyNum - 1) / 2 + 1;
     }
     return -1;
 }

diff --git a/src/database/pgndatabase.cpp b/src/database/pgndatabase.cpp
@@ -825,14 +825,10 @@ inline void PgnDatabase::parseMoveToken(GameX* game, QString token)
     QChar c = token.at(0);
     if (c.isDigit())
     {
-        int x = game->ply()+1;   // We still need to enter the next move
-        int n = 2*token.toInt(); // Convert move to ply
-        if (abs(n-x)>1)
-        {
-            m_variation = -1;
-        }
+        moveNumberFound = token.toInt();
         return;
     }
+
     if (token.startsWith("..."))
     {
         white = false;
@@ -848,6 +844,17 @@ inline void PgnDatabase::parseMoveToken(GameX* game, QString token)
 
     if (token.isEmpty()) return;
 
+    if (found)
+    {
+        int currentMoveNumber = game->cursor().moveNumber();
+        if (m_newVariation && !white) currentMoveNumber--;
+        if (currentMoveNumber != moveNumberFound)
+        {
+            m_variation = -1;
+            return;
+        }
+    }
+
     if(m_newVariation)
     {
         bool dummyNeeded = found && (((white && game->board().whiteToMove()) ||

diff --git a/src/database/pgndatabase.h b/src/database/pgndatabase.h
@@ -151,6 +151,7 @@ class PgnDatabase : public Database
     int percentDone;
     bool white;
     bool found;
+    int  moveNumberFound;
     bool bUse64bit {false};
 };