jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 16:24:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: change isFromBottom check to static function

Browse source
This commit is contained in:
Vasco Guerreiro Vintém Morais 2026-04-06 09:45:00 +01:00
parent acb11c881b
commit 6b72b15027
1 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

47
libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
View file

@ -229,6 +229,36 @@ shouldBeFaceDown(const MoveCardStruct &cardStruct, const Server_CardZone *startZ
return false;
}
/**
* @brief Determines whether a set of moved cards is from the bottom of the deck
*/
static bool shouldBeFromTheBottom(const Server_CardZone *startZone, const std::set<MoveCardStruct> &cardsToMove)
{
if (!startZone) {
return false;
}
if (startZone->getName() != ZoneNames::DECK) {
return false;
}
int movedCount = static_cast<int>(cardsToMove.size());
int tailStart = startZone->getCards().size() - movedCount;
if (tailStart <= 0) { // if the move includes the start of the deck, it should not be considered from the bottom
return false;
}
int expectedPosition = tailStart;
for (const auto &card : cardsToMove) {
if (card.position != expectedPosition) {
return false;
}
++expectedPosition;
}
return true;
}
Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
Server_CardZone *startzone,
const QList<const CardToMove *> &_cards,
@ -289,22 +319,7 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
bool revealTopStart = false;
bool revealTopTarget = false;
bool isFromBottom = false;
if (startzone->getName() == ZoneNames::DECK) {
int movedCount = static_cast<int>(cardsToMove.size());
int tailStart = startzone->getCards().size() - movedCount;
if (tailStart >= 0) {
isFromBottom = true;
int expectedPosition = tailStart;
for (const auto &card : cardsToMove) {
if (card.position != expectedPosition) {
isFromBottom = false;
break;
}
++expectedPosition;
}
}
}
bool isFromBottom = shouldBeFromTheBottom(startzone, cardsToMove);
if (isFromBottom) {
std::ranges::reverse_view reversedCardsToMove{cardsToMove};