jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 00:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

more cleanup

Browse source
This commit is contained in:
RickyRister 2025-01-04 01:44:48 -08:00
parent 5aa1cfea21
commit 57ef80d82d
1 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/game/zones/view_zone.cpp
View file

@ -111,16 +111,20 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
void ZoneViewZone::updateCardIds(CardAction action) void ZoneViewZone::updateCardIds(CardAction action)
{ {
int cardCount = cards.size(); if (origZone->contentsKnown()) {
if (!origZone->contentsKnown()) { return;
}
if (cards.isEmpty()) { if (cards.isEmpty()) {
return; return;
} }
int cardCount = cards.size();
auto startId = 0; auto startId = 0;
if (isReversed) { if (isReversed) {
// these get called after this zone's card list updates but before parent zone's card list updates // the card has not been added to origZone's cardList at this point
startId = origZone->getCards().size() - cardCount; startId = origZone->getCards().size() - cardCount;
switch (action) { switch (action) {
case INITIALIZE: case INITIALIZE:
@ -137,7 +141,6 @@ void ZoneViewZone::updateCardIds(CardAction action)
for (int i = 0; i < cardCount; ++i) { for (int i = 0; i < cardCount; ++i) {
cards[i]->setId(i + startId); cards[i]->setId(i + startId);
} }
}
} }
// Because of boundingRect(), this function must not be called before the zone was added to a scene. // Because of boundingRect(), this function must not be called before the zone was added to a scene.