jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

allow multiple zoneviews (#4263)

Browse source
This commit is contained in:
ebbit1q 2021-03-13 20:43:50 +01:00 • committed by GitHub
parent 1811f7305e
commit 8e1d7d12e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/gamescene.cpp
View file

@ -144,12 +144,10 @@ void GameScene::rearrange()
void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards)
{
for (int i = 0; i < zoneViews.size(); i++) {
ZoneViewZone *temp = zoneViews[i]->getZone();
if ((temp->getName() == zoneName) && (temp->getPlayer() == player)) { // view is already open
zoneViews[i]->close();
if (temp->getNumberCards() == numberCards)
return;
for (auto &view : zoneViews) {
ZoneViewZone *temp = view->getZone();
if (temp->getName() == zoneName && temp->getPlayer() == player && temp->getNumberCards() == numberCards) {
view->close();
}
}
@ -157,12 +155,13 @@ void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numb
zoneViews.append(item);
connect(item, SIGNAL(closePressed(ZoneViewWidget *)), this, SLOT(removeZoneView(ZoneViewWidget *)));
addItem(item);
if (zoneName == "grave")
if (zoneName == "grave") {
item->setPos(360, 100);
else if (zoneName == "rfg")
} else if (zoneName == "rfg") {
item->setPos(380, 120);
else
} else {
item->setPos(340, 80);
}
}
void GameScene::addRevealedZoneView(Player *player,