Remove isView flag from CardZone (#5728)

* Remove `isView` flag from CardZone

This flag is used for two purposes:

 1. It is used as a check for casting to a zone to a `ZoneViewZone`;

 2. Non-view zones are added to the player's zones on construction

This patch removes the `isView` flag and instead:

 1. We directly cast zones to `ZoneViewZone` using a dynamic (qobject)
    cast and use the result of the cast instead of the `isView` flag to
    detect if we are a view zone or not;

 2. The player records its own zones when they are created, simplifying
    control flow.

* Review

cockatrice/src/game/zones/card_zone.cpp

@@ -19,21 +19,16 @@
  * @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 graphics object.
- * @param _isView whether this zone is a view of another zone. Modifications to a view should modify the original
  */
 CardZone::CardZone(Player *_p,
                    const QString &_name,
                    bool _hasCardAttr,
                    bool _isShufflable,
                    bool _contentsKnown,
-                   QGraphicsItem *parent,
-                   bool _isView)
+                   QGraphicsItem *parent)
     : AbstractGraphicsItem(parent), player(_p), name(_name), cards(_contentsKnown), views{}, menu(nullptr),
-      doubleClickAction(0), hasCardAttr(_hasCardAttr), isShufflable(_isShufflable), isView(_isView)
+      doubleClickAction(0), hasCardAttr(_hasCardAttr), isShufflable(_isShufflable)
 {
-    if (!isView)
-        player->addZone(this);
-
     // If we join a game before the card db finishes loading, the cards might have the wrong printings.
     // Force refresh all cards in the zone when db finishes loading to fix that.
     connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
@@ -236,4 +231,4 @@ void CardZone::moveAllToZone()
 QPointF CardZone::closestGridPoint(const QPointF &point)
 {
     return point;
-}
+}

cockatrice/src/game/zones/card_zone.h

@@ -35,7 +35,6 @@ protected:
     QAction *doubleClickAction;
     bool hasCardAttr;
     bool isShufflable;
-    bool isView;
     bool alwaysRevealTopCard;
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
     void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
@@ -65,8 +64,7 @@ public:
              bool _hasCardAttr,
              bool _isShufflable,
              bool _contentsKnown,
-             QGraphicsItem *parent = nullptr,
-             bool _isView = false);
+             QGraphicsItem *parent = nullptr);
     void retranslateUi();
     void clearContents();
     bool getHasCardAttr() const
@@ -115,10 +113,6 @@ public:
     }
     virtual void reorganizeCards() = 0;
     virtual QPointF closestGridPoint(const QPointF &point);
-    bool getIsView() const
-    {
-        return isView;
-    }
     bool getAlwaysRevealTopCard() const
     {
         return alwaysRevealTopCard;

cockatrice/src/game/zones/select_zone.cpp

@@ -37,9 +37,8 @@ SelectZone::SelectZone(Player *_player,
                        bool _hasCardAttr,
                        bool _isShufflable,
                        bool _contentsKnown,
-                       QGraphicsItem *parent,
-                       bool isView)
-    : CardZone(_player, _name, _hasCardAttr, _isShufflable, _contentsKnown, parent, isView)
+                       QGraphicsItem *parent)
+    : CardZone(_player, _name, _hasCardAttr, _isShufflable, _contentsKnown, parent)
 {
 }
 

cockatrice/src/game/zones/select_zone.h

@@ -26,8 +26,7 @@ public:
                bool _hasCardAttr,
                bool _isShufflable,
                bool _contentsKnown,
-               QGraphicsItem *parent = nullptr,
-               bool isView = false);
+               QGraphicsItem *parent = nullptr);
 };
 
 qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse = false);

cockatrice/src/game/zones/view_zone.cpp

@@ -30,7 +30,7 @@ ZoneViewZone::ZoneViewZone(Player *_p,
                            bool _writeableRevealZone,
                            QGraphicsItem *parent,
                            bool _isReversed)
-    : SelectZone(_p, _origZone->getName(), false, false, true, parent, true), bRect(QRectF()), minRows(0),
+    : SelectZone(_p, _origZone->getName(), false, false, true, parent), bRect(QRectF()), minRows(0),
       numberCards(_numberCards), origZone(_origZone), revealZone(_revealZone),
       writeableRevealZone(_writeableRevealZone), groupBy(CardList::NoSort), sortBy(CardList::NoSort),
       isReversed(_isReversed)