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

Merge pull request #1216 from ZeldaZach/fix_morphs

Browse source 
Fix Morphs from Sharing Information
This commit is contained in:
Zach 2015-07-07 22:00:32 -04:00
commit f199e20740
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/carditem.cpp
View file

@ -110,7 +110,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QStringList ptDbSplit = db->getCard(name)->getPowTough().split("/"); QStringList ptDbSplit = db->getCard(name)->getPowTough().split("/");
QStringList ptSplit = pt.split("/"); QStringList ptSplit = pt.split("/");
if (ptDbSplit.at(0) != ptSplit.at(0) || ptDbSplit.at(1) != ptSplit.at(1)) if (getFaceDown() || ptDbSplit.at(0) != ptSplit.at(0) || ptDbSplit.at(1) != ptSplit.at(1))
painter->setPen(QColor(255, 150, 0)); painter->setPen(QColor(255, 150, 0));
else else
painter->setPen(Qt::white); painter->setPen(Qt::white);

5
common/server_card.cpp
View file

@ -126,14 +126,17 @@ void Server_Card::getInfo(ServerInfo_Card *info)
info->set_name(displayedName.toStdString()); info->set_name(displayedName.toStdString());
info->set_x(coord_x); info->set_x(coord_x);
info->set_y(coord_y); info->set_y(coord_y);
QString ptStr = getPT();
if (facedown) if (facedown)
{
info->set_face_down(true); info->set_face_down(true);
ptStr = getPT();
}
info->set_tapped(tapped); info->set_tapped(tapped);
if (attacking) if (attacking)
info->set_attacking(true); info->set_attacking(true);
if (!color.isEmpty()) if (!color.isEmpty())
info->set_color(color.toStdString()); info->set_color(color.toStdString());
const QString ptStr = getPT();
if (!ptStr.isEmpty()) if (!ptStr.isEmpty())
info->set_pt(ptStr.toStdString()); info->set_pt(ptStr.toStdString());
if (!annotation.isEmpty()) if (!annotation.isEmpty())