diff --git a/cpp/src/model/pieces/pawn.cpp b/cpp/src/model/pieces/pawn.cpp index dbac2b3..aa4db0a 100644 --- a/cpp/src/model/pieces/pawn.cpp +++ b/cpp/src/model/pieces/pawn.cpp @@ -12,18 +12,17 @@ std::vector pawn_moves(const Board& b, const Coords xy) { int dy = my_colour == Colour::White ? 1 : -1; Coords left{xy.x - 1, xy.y + dy}; int8_t capturable_piece = b.squares[left.to_index()]; - if (capturable_piece != 0) { - if (my_colour != b.colour_at(left)) - if ((my_colour == White && left.y == 7) - || (my_colour == Black && left.y == 0)) - for (auto piece : {Rook, Knigt, Bishop, Queen}) - ret.push_back(Move{ - xy.to_index(), - left.to_index(), - (int8_t) (my_colour | piece) - }); - else - ret.push_back(Move{xy.to_index(), left.to_index()}); + if (capturable_piece != 0 && my_colour != b.colour_at(left)) { + if ((my_colour == White && left.y == 7) + || (my_colour == Black && left.y == 0)) + for (auto piece : {Rook, Knigt, Bishop, Queen}) + ret.push_back(Move{ + xy.to_index(), + left.to_index(), + (int8_t) (my_colour | piece) + }); + else + ret.push_back(Move{xy.to_index(), left.to_index()}); } } @@ -32,19 +31,18 @@ std::vector pawn_moves(const Board& b, const Coords xy) { int dy = my_colour == Colour::White ? 1 : -1; Coords right{xy.x + 1, xy.y + dy}; int8_t capturable_piece = b.squares[right.to_index()]; - if (capturable_piece != 0) { - if (my_colour != b.colour_at(right)) - if ((my_colour == White && right.y == 7) - || (my_colour == Black && right.y == 0)) + if (capturable_piece != 0 && my_colour != b.colour_at(right)) { + if ((my_colour == White && right.y == 7) + || (my_colour == Black && right.y == 0)) - for (auto piece : {Rook, Knigt, Bishop, Queen}) - ret.push_back(Move{ - xy.to_index(), - right.to_index(), - (int8_t) (my_colour | piece) - }); - else - ret.push_back(Move{xy.to_index(), right.to_index()}); + for (auto piece : {Rook, Knigt, Bishop, Queen}) + ret.push_back(Move{ + xy.to_index(), + right.to_index(), + (int8_t) (my_colour | piece) + }); + else + ret.push_back(Move{xy.to_index(), right.to_index()}); } }