X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=0a6ab136156577d577d840ad6b95694a514c155a;hb=d5f2e32b5c2bba5056df7804704f14af0977a8ed;hp=4414519d1301b6b0021f3c211d324ada81f00a84;hpb=d74025a34e7589fcc0ba93b878cd6484108f9088;p=stockfish

diff --git a/src/position.h b/src/position.h
index 4414519d..0a6ab136 100644
--- a/src/position.h
+++ b/src/position.h
@@ -21,25 +21,12 @@
 #if !defined(POSITION_H_INCLUDED)
 #define POSITION_H_INCLUDED
 
-// Disable some silly and noisy warning from MSVC compiler
-#if defined(_MSC_VER)
-
-// Forcing value to bool 'true' or 'false' (performance warning)
-#pragma warning(disable: 4800)
-
-// Conditional expression is constant
-#pragma warning(disable: 4127)
-
-
-#endif
-
 ////
 //// Includes
 ////
 
 #include "bitboard.h"
 #include "color.h"
-#include "direction.h"
 #include "move.h"
 #include "piece.h"
 #include "square.h"
@@ -151,7 +138,7 @@ public:
 
   // Text input/output
   void from_fen(const std::string& fen);
-  const std::string to_fen() const;
+  const std::string to_fen(bool isChess960) const;
   void print(Move m = MOVE_NONE) const;
 
   // Copying
@@ -209,6 +196,7 @@ public:
   // Information about attacks to or from a given square
   Bitboard attackers_to(Square s) const;
   Bitboard attacks_from(Piece p, Square s) const;
+  static Bitboard attacks_from(Piece p, Square s, Bitboard occ);
   template<PieceType> Bitboard attacks_from(Square s) const;
   template<PieceType> Bitboard attacks_from(Square s, Color c) const;
 
@@ -270,7 +258,6 @@ public:
   // Other properties of the position
   bool opposite_colored_bishops() const;
   bool has_pawn_on_7th(Color c) const;
-  bool is_chess960() const;
 
   // Current thread ID searching on the position
   int thread() const;
@@ -293,8 +280,8 @@ private:
   // Initialization helper functions (used while setting up a position)
   void clear();
   void put_piece(Piece p, Square s);
-  void allow_oo(Color c);
-  void allow_ooo(Color c);
+  void do_allow_oo(Color c);
+  void do_allow_ooo(Color c);
   bool set_castling_rights(char token);
 
   // Helper functions for doing and undoing moves
@@ -335,7 +322,6 @@ private:
   int castleRightsMask[64];
   StateInfo startState;
   File initialKFile, initialKRFile, initialQRFile;
-  bool isChess960;
   int startPosPlyCounter;
   int threadID;
   int64_t nodes;
@@ -349,6 +335,8 @@ private:
   static Score PieceSquareTable[16][64];
   static Key zobExclusion;
   static const Value seeValues[8];
+  static const Value PieceValueMidgame[17];
+  static const Value PieceValueEndgame[17];
 };
 
 
@@ -401,7 +389,7 @@ inline Bitboard Position::occupied_squares() const {
 }
 
 inline Bitboard Position::empty_squares() const {
-  return ~(occupied_squares());
+  return ~occupied_squares();
 }
 
 inline Bitboard Position::pieces_of_color(Color c) const {
@@ -545,12 +533,10 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
 }
 
 inline int Position::rule_50_counter() const {
-
   return st->rule50;
 }
 
 inline int Position::startpos_ply_counter() const {
-
   return startPosPlyCounter;
 }
 
@@ -562,15 +548,9 @@ inline bool Position::opposite_colored_bishops() const {
 }
 
 inline bool Position::has_pawn_on_7th(Color c) const {
-
   return pieces(PAWN, c) & relative_rank_bb(c, RANK_7);
 }
 
-inline bool Position::is_chess960() const {
-
-  return isChess960;
-}
-
 inline bool Position::move_is_capture(Move m) const {
 
   // Move must not be MOVE_NONE !
@@ -591,4 +571,12 @@ inline int Position::thread() const {
   return threadID;
 }
 
+inline void Position::do_allow_oo(Color c) {
+  st->castleRights |= (1 + int(c));
+}
+
+inline void Position::do_allow_ooo(Color c) {
+  st->castleRights |= (4 + 4*int(c));
+}
+
 #endif // !defined(POSITION_H_INCLUDED)