Better naming borrowed from Critter

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index a933c3faf6e41f843000730a34839a6fa0ad0627..2930b8c853fdb7927c911fbc16d5a467dbc87d6e 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -204,7 +204,7 @@ public:
 
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
-  void flip();
+  void flip_me();
 
   // Global initialization
   static void init();
@@ -380,7 +380,7 @@ inline bool Position::in_check() const {
 }
 
 inline bool Position::pawn_is_passed(Color c, Square s) const {
-  return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s));
+  return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s));
 }
 
 inline Key Position::get_key() const {
@@ -423,7 +423,7 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
 }
 
 inline int Position::startpos_ply_counter() const {
-  return startPosPly;
+  return startPosPly + st->pliesFromNull; // HACK
 }
 
 inline bool Position::opposite_colored_bishops() const {