X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=02e2d45515a1588b8bfbd7792f7fbc4381750371;hp=ba25ef6ed07cc0735f3170b28e903e852bec8ac3;hb=caef31921900e092616c56193e37201b08baa875;hpb=0049d3f337b6f3a66a06503c808d6d8b03b68505

diff --git a/src/types.h b/src/types.h
index ba25ef6e..02e2d455 100644
--- a/src/types.h
+++ b/src/types.h
@@ -35,6 +35,7 @@
 ///               | only in 64-bit mode. For compiling requires hardware with
 ///               | popcnt support.
 
+#include <cctype>
 #include <climits>
 #include <cstdlib>
 
@@ -136,6 +137,11 @@ enum CastleRight {
   ALL_CASTLES  = 15
 };
 
+enum CastlingSide {
+  KING_SIDE,
+  QUEEN_SIDE
+};
+
 enum ScaleFactor {
   SCALE_FACTOR_DRAW   = 0,
   SCALE_FACTOR_NORMAL = 64,
@@ -306,21 +312,20 @@ inline Score apply_weight(Score v, Score w) {
 #undef ENABLE_OPERATORS_ON
 #undef ENABLE_SAFE_OPERATORS_ON
 
-const Value PawnValueMidgame   = Value(0x0C6);
-const Value PawnValueEndgame   = Value(0x102);
-const Value KnightValueMidgame = Value(0x331);
-const Value KnightValueEndgame = Value(0x34E);
-const Value BishopValueMidgame = Value(0x344);
-const Value BishopValueEndgame = Value(0x359);
-const Value RookValueMidgame   = Value(0x4F6);
-const Value RookValueEndgame   = Value(0x4FE);
-const Value QueenValueMidgame  = Value(0x9D9);
-const Value QueenValueEndgame  = Value(0x9FE);
+const Value PawnValueMidgame   = Value(198);
+const Value PawnValueEndgame   = Value(258);
+const Value KnightValueMidgame = Value(817);
+const Value KnightValueEndgame = Value(846);
+const Value BishopValueMidgame = Value(836);
+const Value BishopValueEndgame = Value(857);
+const Value RookValueMidgame   = Value(1270);
+const Value RookValueEndgame   = Value(1278);
+const Value QueenValueMidgame  = Value(2521);
+const Value QueenValueEndgame  = Value(2558);
 
 extern const Value PieceValueMidgame[17]; // Indexed by Piece or PieceType
 extern const Value PieceValueEndgame[17];
 extern int SquareDistance[64][64];
-extern uint8_t BitCount8Bit[256];
 
 inline Color operator~(Color c) {
   return Color(c ^ 1);
@@ -342,6 +347,10 @@ inline Piece make_piece(Color c, PieceType pt) {
   return Piece((c << 3) | pt);
 }
 
+inline CastleRight make_castle_right(Color c, CastlingSide s) {
+  return CastleRight((s == KING_SIDE ? WHITE_OO : WHITE_OOO) << c);
+}
+
 inline PieceType type_of(Piece p)  {
   return PieceType(p & 7);
 }