From 929f4f9b4de85767528a464d0bdea0cf10522f75 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Tue, 9 Mar 2010 14:43:06 +0100 Subject: [PATCH] cleanup --- cockatrice/src/carddragitem.cpp | 10 ++-------- cockatrice/src/cardzone.cpp | 7 +------ cockatrice/src/cardzone.h | 2 -- cockatrice/src/deckview.cpp | 1 - cockatrice/src/gamescene.cpp | 1 + cockatrice/src/player.cpp | 11 ++++------- cockatrice/src/zoneviewzone.cpp | 2 -- common/server_game.cpp | 5 +++++ common/server_player.cpp | 3 --- common/server_player.h | 2 +- 10 files changed, 14 insertions(+), 30 deletions(-) diff --git a/cockatrice/src/carddragitem.cpp b/cockatrice/src/carddragitem.cpp index 6d8245ff..6625234a 100644 --- a/cockatrice/src/carddragitem.cpp +++ b/cockatrice/src/carddragitem.cpp @@ -5,7 +5,6 @@ #include #include #include -#include CardDragItem::CardDragItem(AbstractCardItem *_item, int _id, const QPointF &_hotSpot, bool _faceDown, AbstractCardDragItem *parentDrag) : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), faceDown(_faceDown), currentZone(0) @@ -20,21 +19,16 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) ZoneViewZone *zoneViewZone = 0; for (int i = colliding.size() - 1; i >= 0; i--) { CardZone *temp = qgraphicsitem_cast(colliding.at(i)); - if (temp) - qDebug() << "zone name:" << temp->getName(); if (!cardZone) cardZone = temp; if (!zoneViewZone) zoneViewZone = qobject_cast(temp); } CardZone *cursorZone = 0; - if (zoneViewZone) { - qDebug() << "zv found"; + if (zoneViewZone) cursorZone = zoneViewZone; - } else if (cardZone) { - qDebug() << "normal found"; + else if (cardZone) cursorZone = cardZone; - } if (!cursorZone) return; currentZone = cursorZone; diff --git a/cockatrice/src/cardzone.cpp b/cockatrice/src/cardzone.cpp index e62b8332..050d400e 100644 --- a/cockatrice/src/cardzone.cpp +++ b/cockatrice/src/cardzone.cpp @@ -82,18 +82,14 @@ void CardZone::mousePressEvent(QGraphicsSceneMouseEvent *event) void CardZone::addCard(CardItem *card, bool reorganize, int x, int y) { - dumpObjectInfo(); if (view) if ((x <= view->getCards().size()) || (view->getNumberCards() == -1)) view->addCard(new CardItem(player, card->getName(), card->getId()), reorganize, x, y); addCardImpl(card, x, y); - if (reorganize) { - qDebug("------------ emitting"); - emit contentsChanged(); + if (reorganize) reorganizeCards(); - } } CardItem *CardZone::getCard(int cardId, const QString &cardName) @@ -137,7 +133,6 @@ CardItem *CardZone::takeCard(int position, int cardId, const QString &cardName, c->setId(cardId); c->setName(cardName); - emit contentsChanged(); reorganizeCards(); return c; } diff --git a/cockatrice/src/cardzone.h b/cockatrice/src/cardzone.h index 1cee960f..8a726101 100644 --- a/cockatrice/src/cardzone.h +++ b/cockatrice/src/cardzone.h @@ -27,8 +27,6 @@ protected: void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event); virtual void addCardImpl(CardItem *card, int x, int y) = 0; -signals: - void contentsChanged(); public slots: void moveAllToZone(); public: diff --git a/cockatrice/src/deckview.cpp b/cockatrice/src/deckview.cpp index 3d236bee..5f34e0dc 100644 --- a/cockatrice/src/deckview.cpp +++ b/cockatrice/src/deckview.cpp @@ -3,7 +3,6 @@ #include "decklist.h" #include "carddatabase.h" #include "main.h" -#include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag) : AbstractCardDragItem(_item, _hotSpot, parentDrag) diff --git a/cockatrice/src/gamescene.cpp b/cockatrice/src/gamescene.cpp index 469d3ac3..23c1561d 100644 --- a/cockatrice/src/gamescene.cpp +++ b/cockatrice/src/gamescene.cpp @@ -83,6 +83,7 @@ void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numb views.append(item); connect(item, SIGNAL(closePressed(ZoneViewWidget *)), this, SLOT(removeZoneView(ZoneViewWidget *))); addItem(item); + item->setPos(100, 100); } void GameScene::removeZoneView(ZoneViewWidget *item) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 74dc1c5f..16f7b774 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -601,12 +601,6 @@ void Player::eventMoveCard(Event_MoveCard *event) if (!startZone || !targetZone) return; - qDebug("Player::eventMoveCard --- startZone"); - startZone->dumpObjectInfo(); - qDebug("Player::eventMoveCard --- targetZone"); - targetZone->dumpObjectInfo(); - qDebug("---"); - int position = event->getPosition(); int x = event->getX(); int y = event->getY(); @@ -747,13 +741,16 @@ void Player::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/ void Player::processPlayerInfo(ServerInfo_Player *info) { + QMapIterator zoneIt(zones); + while (zoneIt.hasNext()) + zoneIt.next().value()->clearContents(); + for (int i = 0; i < info->getZoneList().size(); ++i) { ServerInfo_Zone *zoneInfo = info->getZoneList()[i]; CardZone *zone = zones.value(zoneInfo->getName(), 0); if (!zone) continue; - zone->clearContents(); const QList &cardList = zoneInfo->getCardList(); if (cardList.isEmpty()) { for (int j = 0; j < zoneInfo->getCardCount(); ++j) diff --git a/cockatrice/src/zoneviewzone.cpp b/cockatrice/src/zoneviewzone.cpp index d0aa1c06..18834386 100644 --- a/cockatrice/src/zoneviewzone.cpp +++ b/cockatrice/src/zoneviewzone.cpp @@ -39,7 +39,6 @@ void ZoneViewZone::initializeCards() CardItem *card = c.at(i); addCard(new CardItem(player, card->getName(), card->getId(), this), false, i); } - emit contentsChanged(); reorganizeCards(); } } @@ -56,7 +55,6 @@ void ZoneViewZone::zoneDumpReceived(ProtocolResponse *r) addCard(card, false, i); } - emit contentsChanged(); reorganizeCards(); } diff --git a/common/server_game.cpp b/common/server_game.cpp index 7dc1ec1f..79ff341d 100644 --- a/common/server_game.cpp +++ b/common/server_game.cpp @@ -154,6 +154,11 @@ void Server_Game::stopGameIfFinished() return; gameStarted = false; + + playerIterator.toFront(); + while (playerIterator.hasNext()) + playerIterator.next().value()->clearZones(); + playerIterator.toFront(); while (playerIterator.hasNext()) { Server_Player *player = playerIterator.next().value(); diff --git a/common/server_player.cpp b/common/server_player.cpp index deb8d832..818433c0 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -53,9 +53,6 @@ int Server_Player::newArrowId() const void Server_Player::setupZones() { - // Delete existing zones and counters - clearZones(); - // This may need to be customized according to the game rules. // ------------------------------------------------------------------ diff --git a/common/server_player.h b/common/server_player.h index 83f73290..f7865040 100644 --- a/common/server_player.h +++ b/common/server_player.h @@ -29,7 +29,6 @@ private: bool spectator; int initialCards; int nextCardId; - void clearZones(); bool readyStart; bool conceded; int deckId; @@ -68,6 +67,7 @@ public: void addCounter(Server_Counter *counter); bool deleteCounter(int counterId); + void clearZones(); void setupZones(); void sendProtocolItem(ProtocolItem *item, bool deleteItem = true);