Reorder gamestate

lynx-chess · Jan 12, 2024 · 0e4bd95 · 0e4bd95
1 parent e0d2b80
commit 0e4bd95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Lynx/Model/GameState.cs b/src/Lynx/Model/GameState.cs
@@ -3,17 +3,17 @@
 {
     public readonly long ZobristKey;
 
-    public readonly byte Castle;
-
     public readonly int CapturedPiece;
 
     public readonly BoardSquare EnPassant;
 
-    public GameState(long zobristKey, int capturedPiece, byte castle, BoardSquare enpassant)
+    public readonly byte Castle;
+
+    public GameState(long zobristKey, int capturedPiece, BoardSquare enpassant, byte castle)
     {
+        ZobristKey = zobristKey;
         CapturedPiece = capturedPiece;
-        Castle = castle;
         EnPassant = enpassant;
-        ZobristKey = zobristKey;
+        Castle = castle;
     }
 }
diff --git a/src/Lynx/Model/Position.cs b/src/Lynx/Model/Position.cs
@@ -338,7 +338,7 @@ public GameState MakeMove(Move move)
 
         UniqueIdentifier ^= ZobristTable.CastleHash(Castle);
 
-        return new GameState(uniqueIdentifierCopy, capturedPiece, castleCopy, enpassantCopy);
+        return new GameState(uniqueIdentifierCopy, capturedPiece, enpassantCopy, castleCopy);
         //var clone = new Position(this);
         //clone.UnmakeMove(move, gameState);
         //if (uniqueIdentifierCopy != clone.UniqueIdentifier)
@@ -436,7 +436,7 @@ public GameState MakeNullMove()
             ZobristTable.SideHash()
             ^ ZobristTable.EnPassantHash((int)oldEnPassant);
 
-        return new GameState(oldUniqueIdentifier, -1, byte.MaxValue, oldEnPassant);
+        return new GameState(oldUniqueIdentifier, -1, oldEnPassant, byte.MaxValue);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]