aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed #62: shuffling doesn't reveal the top card even if AlwaysRevealTopCard is set

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-07-17 19:22:09 +02:00
parent 886f12d116
commit 4c9165f099
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/server_player.cpp
View file

@ -774,13 +774,23 @@ Response::ResponseCode Server_Player::cmdShuffle(const Command_Shuffle & /*cmd*/
return Response::RespGameNotStarted; return Response::RespGameNotStarted;
if (conceded) if (conceded)
return Response::RespContextError; return Response::RespContextError;
zones.value("deck")->shuffle(); Server_CardZone *deckZone = zones.value("deck");
deckZone->shuffle();
Event_Shuffle event; Event_Shuffle event;
event.set_zone_name("deck"); event.set_zone_name("deck");
ges.enqueueGameEvent(event, playerId); ges.enqueueGameEvent(event, playerId);
if (deckZone->getAlwaysRevealTopCard() && !deckZone->cards.isEmpty()) {
Event_RevealCards revealEvent;
revealEvent.set_zone_name(deckZone->getName().toStdString());
revealEvent.set_card_id(0);
deckZone->cards.first()->getInfo(revealEvent.add_cards());
ges.enqueueGameEvent(revealEvent, playerId);
}
return Response::RespOk; return Response::RespOk;
} }