From c716f859626b8f66e80a39c9f41e81af5ed76ffb Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Wed, 18 Dec 2024 18:46:14 -0800
Subject: [PATCH] refactor: remove cipt param from Player::playCard (#5266)

---
 cockatrice/src/game/board/arrow_item.cpp |  3 +--
 cockatrice/src/game/cards/card_item.cpp  |  2 +-
 cockatrice/src/game/player/player.cpp    | 16 ++++++----------
 cockatrice/src/game/player/player.h      |  4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
index 42fb20b5c..71e4edd91 100644
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -319,8 +319,7 @@ void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCar
 
     // move card onto table first if attaching from some other zone
     if (startZone->getName() != "table") {
-        auto info = startCard->getInfo();
-        player->playCardToTable(startCard, false, info ? info->getCipt() : false);
+        player->playCardToTable(startCard, false);
     }
 
     Command_AttachCard cmd;
diff --git a/cockatrice/src/game/cards/card_item.cpp b/cockatrice/src/game/cards/card_item.cpp
index 49a428e30..af71640d8 100644
--- a/cockatrice/src/game/cards/card_item.cpp
+++ b/cockatrice/src/game/cards/card_item.cpp
@@ -387,7 +387,7 @@ void CardItem::playCard(bool faceDown)
         if (SettingsCache::instance().getClickPlaysAllSelected()) {
             faceDown ? zone->getPlayer()->actPlayFacedown() : zone->getPlayer()->actPlay();
         } else {
-            zone->getPlayer()->playCard(this, faceDown, info ? info->getCipt() : false);
+            zone->getPlayer()->playCard(this, faceDown);
         }
     }
 }
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index a42880ea9..f7a76e3ca 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -1380,10 +1380,7 @@ void Player::moveOneCardUntil(CardItem *card)
     if (isMatch && movingCardsUntilAutoPlay) {
         // Directly calling playCard will deadlock, since we are already in the middle of processing an event.
         // Use QTimer::singleShot to queue up the playCard on the event loop.
-        QTimer::singleShot(0, this, [card, this] {
-            bool cipt = card && card->getInfo() && card->getInfo()->getCipt();
-            playCard(card, false, cipt);
-        });
+        QTimer::singleShot(0, this, [card, this] { playCard(card, false); });
     }
 
     if (zones.value("deck")->getCards().empty() || !card) {
@@ -2648,7 +2645,7 @@ void Player::processCardAttachment(const ServerInfo_Player &info)
     }
 }
 
-void Player::playCard(CardItem *card, bool faceDown, bool tapped)
+void Player::playCard(CardItem *card, bool faceDown)
 {
     if (card == nullptr) {
         return;
@@ -2685,7 +2682,7 @@ void Player::playCard(CardItem *card, bool faceDown, bool tapped)
         if (!faceDown) {
             cardToMove->set_pt(info->getPowTough().toStdString());
         }
-        cardToMove->set_tapped(faceDown ? false : tapped);
+        cardToMove->set_tapped(!faceDown && info->getCipt());
         if (tableRow != 3)
             cmd.set_target_zone("table");
         cmd.set_x(gridPoint.x());
@@ -2698,7 +2695,7 @@ void Player::playCard(CardItem *card, bool faceDown, bool tapped)
  * Like {@link Player::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 Player::playCardToTable(CardItem *card, bool faceDown, bool tapped)
+void Player::playCardToTable(CardItem *card, bool faceDown)
 {
     if (card == nullptr) {
         return;
@@ -2727,7 +2724,7 @@ void Player::playCardToTable(CardItem *card, bool faceDown, bool tapped)
     if (!faceDown) {
         cardToMove->set_pt(info->getPowTough().toStdString());
     }
-    cardToMove->set_tapped(faceDown ? false : tapped);
+    cardToMove->set_tapped(!faceDown && info->getCipt());
     cmd.set_target_zone("table");
     cmd.set_x(gridPoint.x());
     cmd.set_y(gridPoint.y());
@@ -3574,8 +3571,7 @@ void Player::playSelectedCards(const bool faceDown)
 
     for (auto &card : selectedCards) {
         if (card && !isUnwritableRevealZone(card->getZone()) && card->getZone()->getName() != "table") {
-            const bool cipt = !faceDown && card->getInfo() ? card->getInfo()->getCipt() : false;
-            playCard(card, faceDown, cipt);
+            playCard(card, faceDown);
         }
     }
 }
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index a71d641f1..62b825472 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -394,8 +394,8 @@ public:
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
-    void playCard(CardItem *c, bool faceDown, bool tapped);
-    void playCardToTable(CardItem *c, bool faceDown, bool tapped);
+    void playCard(CardItem *c, bool faceDown);
+    void playCardToTable(CardItem *c, bool faceDown);
     void addCard(CardItem *c);
     void deleteCard(CardItem *c);
     void addZone(CardZone *z);