X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=092f7d73ed084be2a4a6881890d23a429e072523;hb=e5077dc11e8047eb8ce32a166a73e433a7e19b15;hp=81f96ccdc74162d7ac63e1b37eece83b23ad9a60;hpb=351ef5c85b6d4b9c71e9da367f0be5ab6e6f8117;p=stockfish

diff --git a/src/search.cpp b/src/search.cpp
index 81f96ccd..092f7d73 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -300,7 +300,7 @@ namespace {
     if (moveIsCheck && pos.see_sign(m) >= 0)
         result += CheckExtension[PvNode];
 
-    if (pos.type_of_piece_on(move_from(m)) == PAWN)
+    if (piece_type(pos.piece_on(move_from(m))) == PAWN)
     {
         Color c = pos.side_to_move();
         if (relative_rank(c, move_to(m)) == RANK_7)
@@ -316,7 +316,7 @@ namespace {
     }
 
     if (   captureOrPromotion
-        && pos.type_of_piece_on(move_to(m)) != PAWN
+        && piece_type(pos.piece_on(move_to(m))) != PAWN
         && (  pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK)
             - piece_value_midgame(pos.piece_on(move_to(m))) == VALUE_ZERO)
         && !move_is_special(m))
@@ -403,7 +403,7 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) {
   NodesSincePoll = 0;
   current_search_time(get_system_time());
   Limits = limits;
-  TimeMgr.init(Limits, pos.startpos_ply_counter());
+  TimeMgr.init(Limits, pos.full_moves());
 
   // Set output steram in normal or chess960 mode
   cout << set960(pos.is_chess960());
@@ -1524,18 +1524,18 @@ split_point_start: // At split points actual search starts from here
     newAtt = pos.attacks_from(pc,   to, occ);
 
     // Rule 1. Checks which give opponent's king at most one escape square are dangerous
-    b = kingAtt & ~pos.pieces_of_color(them) & ~newAtt & ~(1ULL << to);
+    b = kingAtt & ~pos.pieces(them) & ~newAtt & ~(1ULL << to);
 
     if (!(b && (b & (b - 1))))
         return true;
 
     // Rule 2. Queen contact check is very dangerous
-    if (   type_of_piece(pc) == QUEEN
+    if (   piece_type(pc) == QUEEN
         && bit_is_set(kingAtt, to))
         return true;
 
     // Rule 3. Creating new double threats with checks
-    b = pos.pieces_of_color(them) & newAtt & ~oldAtt & ~(1ULL << ksq);
+    b = pos.pieces(them) & newAtt & ~oldAtt & ~(1ULL << ksq);
 
     while (b)
     {
@@ -1666,7 +1666,7 @@ split_point_start: // At split points actual search starts from here
     // value of the threatening piece, don't prune moves which defend it.
     if (   pos.move_is_capture(threat)
         && (   piece_value_midgame(pos.piece_on(tfrom)) >= piece_value_midgame(pos.piece_on(tto))
-            || pos.type_of_piece_on(tfrom) == KING)
+            || piece_type(pos.piece_on(tfrom)) == KING)
         && pos.move_attacks_square(m, tto))
         return true;