aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleaned up log widget

Browse source
This commit is contained in:
brukie 2009-06-10 13:11:12 +02:00
parent 21daf9db99
commit 05e12636ea
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/messagelogwidget.cpp
View file

@ -104,6 +104,8 @@ void MessageLogWidget::logSetCardCounters(QString playerName, QString cardName,
void MessageLogWidget::logSetTapped(QString playerName, QString cardName, bool tapped) void MessageLogWidget::logSetTapped(QString playerName, QString cardName, bool tapped)
{ {
if (cardName == "-1")
cardName = tr("his permanents");
appendAndScroll(tr("%1 %2 %3").arg(playerName).arg(tapped ? "taps" : "untaps").arg(cardName)); appendAndScroll(tr("%1 %2 %3").arg(playerName).arg(tapped ? "taps" : "untaps").arg(cardName));
} }

5
cockatrice/src/player.cpp
View file

@ -123,7 +123,8 @@ void Player::setCardAttrHelper(CardItem *card, const QString &aname, const QStri
if (aname == "tapped") { if (aname == "tapped") {
bool tapped = avalue == "1"; bool tapped = avalue == "1";
if (!(!tapped && card->getDoesntUntap() && allCards)) { if (!(!tapped && card->getDoesntUntap() && allCards)) {
emit logSetTapped(name, card->getName(), tapped); if (!allCards)
emit logSetTapped(name, card->getName(), tapped);
card->setTapped(tapped); card->setTapped(tapped);
} }
} else if (aname == "attacking") } else if (aname == "attacking")
@ -264,6 +265,8 @@ void Player::gameEvent(const ServerEventData &event)
CardList *const cards = zone->getCards(); CardList *const cards = zone->getCards();
for (int i = 0; i < cards->size(); i++) for (int i = 0; i < cards->size(); i++)
setCardAttrHelper(cards->at(i), aname, avalue, true); setCardAttrHelper(cards->at(i), aname, avalue, true);
if (aname == "tapped")
emit logSetTapped(name, QString("-1"), avalue == "1");
} else { } else {
CardItem *card = zone->getCard(cardId, ""); CardItem *card = zone->getCard(cardId, "");
setCardAttrHelper(card, aname, avalue, false); setCardAttrHelper(card, aname, avalue, false);