X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=f36168c9a7db884cea5b170972978feb1fdf8271;hp=a018f2c17dc6b8bf41a0e5ce5eeee5383208487a;hb=94b3cdd908f68e20a09f67dba40103fd671f5f17;hpb=2acda1fde3e1542a0b1bfc5a0885559e6daf142a diff --git a/src/pawns.h b/src/pawns.h index a018f2c1..f36168c9 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ namespace Pawns { struct Entry { - Score pawns_score() const { return score; } + Score pawn_score(Color c) const { return scores[c]; } Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; } Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; } @@ -45,10 +45,6 @@ struct Entry { return semiopenFiles[c] & (1 << f); } - int semiopen_side(Color c, File f, bool leftSide) const { - return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1)); - } - int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][bool(DarkSquares & s)]; } @@ -66,7 +62,7 @@ struct Entry { Value shelter_storm(const Position& pos, Square ksq); Key key; - Score score; + Score scores[COLOR_NB]; Bitboard passedPawns[COLOR_NB]; Bitboard pawnAttacks[COLOR_NB]; Bitboard pawnAttacksSpan[COLOR_NB];