jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-10-11 17:46:00 +02:00
commit fbcb34db61
39 changed files with 1125 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/player.cpp
View file

@ -528,7 +528,7 @@ void Player::setCardAttrHelper(CardItem *card, const QString &aname, const QStri
if (!(!tapped && card->getDoesntUntap() && allCards)) {
if (!allCards)
emit logSetTapped(this, card->getName(), tapped);
card->setTapped(tapped);
card->setTapped(tapped, true);
}
} else if (aname == "attacking")
card->setAttacking(avalue == "1");
@ -958,7 +958,7 @@ void Player::addZone(CardZone *z)
Counter *Player::addCounter(ServerInfo_Counter *counter)
{
return addCounter(counter->getId(), counter->getName(), counter->getColor(), counter->getRadius(), counter->getCount());
return addCounter(counter->getId(), counter->getName(), counter->getColor().getQColor(), counter->getRadius(), counter->getCount());
}
Counter *Player::addCounter(int counterId, const QString &name, QColor color, int radius, int value)
@ -1012,9 +1012,9 @@ ArrowItem *Player::addArrow(ServerInfo_Arrow *arrow)
return 0;
if (targetCard)
return addArrow(arrow->getId(), startCard, targetCard, arrow->getColor());
return addArrow(arrow->getId(), startCard, targetCard, arrow->getColor().getQColor());
else
return addArrow(arrow->getId(), startCard, targetPlayer->getPlayerTarget(), arrow->getColor());
return addArrow(arrow->getId(), startCard, targetPlayer->getPlayerTarget(), arrow->getColor().getQColor());
}
ArrowItem *Player::addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color)