X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=7fa36ac83dd4a4d5b0e8e19f96f59f5699a4a049;hp=647bd8642df95a023e878ecf3eab942e4ad464c5;hb=86ee4eb84d54dac3f9de5b455ba41909c7722173;hpb=09bef14c76e119103cc1a9404cbde7e249205deb

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 647bd864..7fa36ac8 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -21,11 +21,7 @@
 #include <algorithm>
 
 #include "types.h"
-
-Value PieceValue[PHASE_NB][PIECE_NB] = {
-  { VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg },
-  { VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg }
-};
+#include "bitboard.h"
 
 namespace PSQT {
 
@@ -112,17 +108,14 @@ void init() {
 
   for (Piece pc = W_PAWN; pc <= W_KING; ++pc)
   {
-      PieceValue[MG][~pc] = PieceValue[MG][pc];
-      PieceValue[EG][~pc] = PieceValue[EG][pc];
-
       Score score = make_score(PieceValue[MG][pc], PieceValue[EG][pc]);
 
       for (Square s = SQ_A1; s <= SQ_H8; ++s)
       {
-          File f = map_to_queenside(file_of(s));
+          File f = File(edge_distance(file_of(s)));
           psq[ pc][ s] = score + (type_of(pc) == PAWN ? PBonus[rank_of(s)][file_of(s)]
                                                       : Bonus[pc][rank_of(s)][f]);
-          psq[~pc][~s] = -psq[pc][s];
+          psq[~pc][flip_rank(s)] = -psq[pc][s];
       }
   }
 }