diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index e9a1b52c8..bf1394039 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -438,14 +438,6 @@ bool Player::clearCardsToDelete() return true; } -/** - * Creates a card menu from the given card and sets it as the currently active card menu. - * Will first check if the card should have a card menu, and no-ops if not. - * - * @param card The card to create the menu for. Pass nullptr to disable the card menu. - * @return The new card menu, or nullptr if failed. - */ - void Player::setActive(bool _active) { active = _active; diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index bb96ecb67..6c723805f 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -86,7 +86,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown) } /** - * Like {@link Player::playCard}, but forces the card to be played to the table zone. + * Like {@link PlayerActions::playCard}, but forces the card to be played to the table zone. * Cards with tablerow 3 (the stack) will be played to tablerow 1 (the noncreatures row). */ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown) diff --git a/cockatrice/src/game/player/player_menu.cpp b/cockatrice/src/game/player/player_menu.cpp index 92330899d..0c7588824 100644 --- a/cockatrice/src/game/player/player_menu.cpp +++ b/cockatrice/src/game/player/player_menu.cpp @@ -838,6 +838,13 @@ QMenu *PlayerMenu::createCardMenu(const CardItem *card) return cardMenu; } +/** + * Creates a card menu from the given card and sets it as the currently active card menu. + * Will first check if the card should have a card menu, and no-ops if not. + * + * @param card The card to create the menu for. Pass nullptr to disable the card menu. + * @return The new card menu, or nullptr if failed. + */ QMenu *PlayerMenu::updateCardMenu(const CardItem *card) { if (!card) { diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp index 1b760fc81..ae91f9e7f 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -15,6 +15,7 @@ /** * @param _player the player that the zone belongs to * @param _name internal name of the zone + * @param _hasCardAttr whether cards in the zone can have attributes set on them * @param _isShufflable whether it makes sense to shuffle this zone by default after viewing it * @param _contentsKnown whether the cards in the zone are known to the client * @param parent the parent QObject. diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp index 11fa0a27a..6050cbadf 100644 --- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp @@ -3,6 +3,12 @@ #include "../../../settings/cache_settings.h" #include "../../board/card_item.h" +/** + * @param _player the player that the cards are revealed to. + * @param _origZone the zone the cards were revealed from. + * @param _revealZone if false, the cards will be face down. + * @param _writeableRevealZone whether the player can interact with the revealed cards. + */ ZoneViewZoneLogic::ZoneViewZoneLogic(Player *_player, CardZoneLogic *_origZone, int _numberCards, diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index d96cbc28c..e155d2ec3 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -18,10 +18,6 @@ #include /** - * @param _p the player that the cards are revealed to. - * @param _origZone the zone the cards were revealed from. - * @param _revealZone if false, the cards will be face down. - * @param _writeableRevealZone whether the player can interact with the revealed cards. * @param parent the parent QGraphicsWidget containing the reveal zone */ ZoneViewZone::ZoneViewZone(ZoneViewZoneLogic *_logic, QGraphicsItem *parent)