jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1051 from poixen/reveal_top_x

Browse source 
Reveal top x cards
This commit is contained in:
ctrlaltca 2015-05-16 18:20:56 +02:00
commit 25f444a5af
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/server_player.cpp
View file

@ -1525,7 +1525,14 @@ Response::ResponseCode Server_Player::cmdRevealCards(const Command_RevealCards &
return Response::RespNameNotFound;
QList<Server_Card *> cardsToReveal;
if (!cmd.has_card_id())
if (cmd.top_cards() != -1) {
for (int i = 0; i < cmd.top_cards(); i++) {
Server_Card *card = zone->getCard(i);
if (!card)
return Response::RespNameNotFound;
cardsToReveal.append(card);
}
} else if (!cmd.has_card_id())
cardsToReveal = zone->getCards();
else if (cmd.card_id() == -2) {
if (zone->getCards().isEmpty())