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

minor fixes; ROE set added

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-04-16 16:15:27 +02:00
parent 57aa30ffb5
commit cb045907cb
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/carditem.cpp
View file

@ -127,12 +127,15 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
} else {
if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < 2 * QApplication::startDragDistance())
return;
if (!owner->getLocal())
return;
bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier) || facedown;
createDragItem(id, event->pos(), event->scenePos(), faceDown);
dragItem->grabMouse();
CardZone *zone = (CardZone *) parentItem();
CardZone *zone = static_cast<CardZone *>(parentItem());
QList<QGraphicsItem *> sel = scene()->selectedItems();
int j = 0;

11
cockatrice/src/playerlistwidget.cpp
View file

@ -47,11 +47,12 @@ void PlayerListWidget::updatePlayerProperties(ServerInfo_PlayerProperties *prop)
player->setText(3, prop->getName());
QString deckText;
switch (prop->getDeckId()) {
case -2: deckText = tr("no deck"); break;
case -1: deckText = tr("local deck"); break;
default: deckText = tr("ID #%1").arg(prop->getDeckId());
}
if (!prop->getSpectator())
switch (prop->getDeckId()) {
case -2: deckText = tr("no deck"); break;
case -1: deckText = tr("local deck"); break;
default: deckText = tr("ID #%1").arg(prop->getDeckId());
}
player->setText(4, deckText);
}