X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=9ed72393bfc4f6a595a93e467f6cb235d66ce956;hp=d02514feb860b6723c60fc900ddc9208ca568f7f;hb=36bb57a47e137f075fe546887be01fdd0d4670e3;hpb=d15217b953af28669dd3e5b46303b3ca882f353e

diff --git a/src/position.h b/src/position.h
index d02514fe..9ed72393 100644
--- a/src/position.h
+++ b/src/position.h
@@ -89,8 +89,9 @@ struct StateInfo {
 
 class Position {
 
-  Position(); // No default or copy c'tor allowed
-  Position(const Position& pos);
+  // No default or copy c'tor allowed, default c'tor will not be generated
+  // anyhow because of user-defined c'tors.
+  Position(const Position&);
 
 public:
   Position(const Position& pos, int threadID);
@@ -193,7 +194,7 @@ public:
   template<bool SkipRepetition> bool is_draw() const;
 
   // Number of plies from starting position
-  int full_moves() const;
+  int startpos_ply_counter() const;
 
   // Other properties of the position
   bool opposite_colored_bishops() const;
@@ -221,7 +222,7 @@ private:
   void put_piece(Piece p, Square s);
   void set_castle(int f, Square ksq, Square rsq);
   void set_castling_rights(char token);
-  bool move_is_pl_slow(const Move m) const;
+  bool move_is_legal(const Move m) const;
 
   // Helper functions for doing and undoing moves
   void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep);
@@ -428,8 +429,8 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
         && pawn_is_passed(c, move_to(m));
 }
 
-inline int Position::full_moves() const {
-  return fullMoves;
+inline int Position::startpos_ply_counter() const {
+  return Max(2 * (fullMoves - 1), 0) + int(sideToMove == BLACK);
 }
 
 inline bool Position::opposite_colored_bishops() const {
@@ -449,15 +450,14 @@ inline bool Position::is_chess960() const {
 
 inline bool Position::move_is_capture_or_promotion(Move m) const {
 
-  assert(m != MOVE_NONE && m != MOVE_NULL);
+  assert(move_is_ok(m));
   return move_is_special(m) ? !move_is_castle(m) : !square_is_empty(move_to(m));
 }
 
 inline bool Position::move_is_capture(Move m) const {
 
-  assert(m != MOVE_NONE && m != MOVE_NULL);
-
   // Note that castle is coded as "king captures the rook"
+  assert(move_is_ok(m));
   return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m);
 }