Merge branch 'airbag'

# Conflicts: # cli/profiles/SimpleWhitePlayerProfile.h
federico-terzi · May 9, 2019 · a1c6233 · a1c6233
2 parents 7d4cc16 + ad01087
commit a1c6233
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/movegenerator/HeisenbergMoveGenerator.cpp b/lib/movegenerator/HeisenbergMoveGenerator.cpp
@@ -131,11 +131,13 @@ std::vector<Move> HeisenbergMoveGenerator::generate(const Board &b) const {
     if (!b.is_white) { // SORT BY KING DISTANCE
         //BLACK
         std::sort(current_moves.begin(), current_moves.end(), [&b](const auto &item1, const auto &item2) {
-           return abs(b.king_pos.col - item1.to.col + b.king_pos.row - item1.to.row) <  abs(b.king_pos.col - item2.to.col + b.king_pos.row - item2.to.row);
+            return abs(b.king_pos.col - item1.to.col) + abs(b.king_pos.row - item1.to.row) <
+                   abs(b.king_pos.col - item2.to.col) + abs(b.king_pos.row - item2.to.row);
         });
     } else { // WHITE
         std::sort(current_moves.begin(), current_moves.end(), [&b](const auto &item1, const auto &item2)-> bool {
-           return abs(b.king_pos.col - item1.from.col + b.king_pos.row - item1.from.row) <  abs(b.king_pos.col - item2.from.col + b.king_pos.row - item2.from.row);
+            return abs(b.king_pos.col - item1.from.col) + abs(b.king_pos.row - item1.from.row) <
+                   abs(b.king_pos.col - item2.from.col) + abs(b.king_pos.row - item2.from.row);
         });
     }
     return current_moves;