mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-10 00:04:48 -07:00
blah
This commit is contained in:
parent
55482246dd
commit
59e9416f57
29 changed files with 332 additions and 187 deletions
|
|
@ -546,14 +546,18 @@ 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();
|
||||
|
||||
int logPosition = position;
|
||||
int logX = x;
|
||||
if (position == -1)
|
||||
position = 0;
|
||||
if (x == -1)
|
||||
x = 0;
|
||||
CardItem *card = startZone->takeCard(position, event->getCardId(), event->getCardName(), startZone != targetZone);
|
||||
|
|
@ -702,8 +706,8 @@ void Player::processPlayerInfo(ServerInfo_Player *info)
|
|||
} else {
|
||||
for (int j = 0; j < cardList.size(); ++j) {
|
||||
CardItem *card = new CardItem(this);
|
||||
card->processCardInfo(cardList[i]);
|
||||
zone->addCard(card, false, cardList[i]->getX(), cardList[i]->getY());
|
||||
card->processCardInfo(cardList[j]);
|
||||
zone->addCard(card, false, cardList[j]->getX(), cardList[j]->getY());
|
||||
}
|
||||
}
|
||||
zone->reorganizeCards();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue