From a719e3b306dd15669b289c3999f87c0095cb0f6f Mon Sep 17 00:00:00 2001 From: Rob Blanckaert Date: Mon, 4 Feb 2019 23:33:11 -0800 Subject: [PATCH] Log number of cards revealed to other players. (#3555) --- cockatrice/src/player.cpp | 3 ++- common/pb/event_reveal_cards.proto | 1 + common/server_player.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 43a9db38..1bc0923b 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1854,7 +1854,8 @@ void Player::eventRevealCards(const Event_RevealCards &event) static_cast(scene())->addRevealedZoneView(this, zone, cardList, event.grant_write_access()); } - emit logRevealCards(this, zone, event.card_id(), cardName, otherPlayer, false, cardList.size()); + emit logRevealCards(this, zone, event.card_id(), cardName, otherPlayer, false, + event.has_number_of_cards() ? event.number_of_cards() : cardList.size()); } } diff --git a/common/pb/event_reveal_cards.proto b/common/pb/event_reveal_cards.proto index f6742c69..b525093a 100644 --- a/common/pb/event_reveal_cards.proto +++ b/common/pb/event_reveal_cards.proto @@ -11,4 +11,5 @@ message Event_RevealCards { optional sint32 other_player_id = 3 [default = -1]; repeated ServerInfo_Card cards = 4; optional bool grant_write_access = 5; + optional uint32 number_of_cards = 6; } diff --git a/common/server_player.cpp b/common/server_player.cpp index b9bde462..6f1e332a 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -1660,6 +1660,7 @@ Server_Player::cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer Event_RevealCards eventOthers; eventOthers.set_grant_write_access(cmd.grant_write_access()); eventOthers.set_zone_name(zone->getName().toStdString()); + eventOthers.set_number_of_cards(cardsToReveal.size()); if (cmd.has_card_id()) eventOthers.set_card_id(cmd.card_id()); if (cmd.has_player_id())