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

Get bottom view to update properly when card is inserted into known portion (#5415)

Browse source 
* more cleanup

* turns out reorganizeCards is not needed if the view doesn't change

* works now
This commit is contained in:
RickyRister 2025-01-05 14:43:44 -08:00 • committed by GitHub
parent 5aa1cfea21
commit ffef1b54e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,32 +111,35 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
void ZoneViewZone::updateCardIds(CardAction action) void ZoneViewZone::updateCardIds(CardAction action)
{ {
if (origZone->contentsKnown()) {
return;
}
if (cards.isEmpty()) {
return;
}
int cardCount = cards.size(); int cardCount = cards.size();
if (!origZone->contentsKnown()) {
if (cards.isEmpty()) {
return;
}
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:
break; break;
case ADD_CARD: case ADD_CARD:
startId += 1; startId += 1;
break; break;
case REMOVE_CARD: case REMOVE_CARD:
startId -= 1; startId -= 1;
break; break;
}
} }
}
for (int i = 0; i < cardCount; ++i) { for (int i = 0; i < cardCount; ++i) {
cards[i]->setId(i + startId); cards[i]->setId(i + startId);
}
} }
} }
@ -275,21 +278,24 @@ void ZoneViewZone::setPileView(int _pileView)
void ZoneViewZone::addCardImpl(CardItem *card, int x, int /*y*/) void ZoneViewZone::addCardImpl(CardItem *card, int x, int /*y*/)
{ {
// if x is negative set it to add at end if (!isReversed) {
if (x < 0 || x >= cards.size()) { // if x is negative set it to add at end
x = cards.size(); if (x < 0) {
} x = cards.size();
}
if (isReversed) { cards.insert(x, card);
if (x != 0) { } else {
cards.append(card); // map x (which is in origZone indexes) to this viewZone's cardList index
int firstId = cards.isEmpty() ? origZone->getCards().size() : cards.front()->getId();
int insertionIndex = x - firstId;
if (insertionIndex >= 0) {
// card was put into a portion of the deck that's in the view
cards.insert(insertionIndex, card);
} else { } else {
// card was put into a portion of the deck that's not in the view
updateCardIds(ADD_CARD); updateCardIds(ADD_CARD);
reorganizeCards();
return; return;
} }
} else {
cards.insert(x, card);
} }
card->setParentItem(this); card->setParentItem(this);
@ -324,7 +330,6 @@ void ZoneViewZone::removeCard(int position)
position -= cards.first()->getId(); position -= cards.first()->getId();
if (position < 0 || position >= cards.size()) { if (position < 0 || position >= cards.size()) {
updateCardIds(REMOVE_CARD); updateCardIds(REMOVE_CARD);
reorganizeCards();
return; return;
} }
} }