karma/stickfosh
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

small refactoring to get rid of compiler warning

Browse Source
This commit is contained in:
Karma Riuk 2025-02-06 16:18:13 +01:00
parent 72f3431418
commit 42484f4217
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cpp/src/model/pieces/pawn.cpp
View File

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