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

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
Show stats 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 { } else {
if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < 2 * QApplication::startDragDistance()) if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < 2 * QApplication::startDragDistance())
return; return;
if (!owner->getLocal())
return;
bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier) || facedown; bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier) || facedown;
createDragItem(id, event->pos(), event->scenePos(), faceDown); createDragItem(id, event->pos(), event->scenePos(), faceDown);
dragItem->grabMouse(); dragItem->grabMouse();
CardZone *zone = (CardZone *) parentItem(); CardZone *zone = static_cast<CardZone *>(parentItem());
QList<QGraphicsItem *> sel = scene()->selectedItems(); QList<QGraphicsItem *> sel = scene()->selectedItems();
int j = 0; 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()); player->setText(3, prop->getName());
QString deckText; QString deckText;
switch (prop->getDeckId()) { if (!prop->getSpectator())
case -2: deckText = tr("no deck"); break; switch (prop->getDeckId()) {
case -1: deckText = tr("local deck"); break; case -2: deckText = tr("no deck"); break;
default: deckText = tr("ID #%1").arg(prop->getDeckId()); case -1: deckText = tr("local deck"); break;
} default: deckText = tr("ID #%1").arg(prop->getDeckId());
}
player->setText(4, deckText); player->setText(4, deckText);
} }

1
common/serializable_item.h
View file

@ -1,6 +1,7 @@
#ifndef SERIALIZABLE_ITEM_H #ifndef SERIALIZABLE_ITEM_H
#define SERIALIZABLE_ITEM_H #define SERIALIZABLE_ITEM_H
#include <QtCore/QXmlStreamWriter>
#include <QObject> #include <QObject>
#include <QMap> #include <QMap>
#include <QList> #include <QList>

6
oracle/sets.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<cockatrice_setdatabase version="20091017"> <cockatrice_setdatabase version="20100416">
<picture_url>http://www.wizards.com/global/images/magic/general/%1.jpg</picture_url> <picture_url>http://www.wizards.com/global/images/magic/general/%1.jpg</picture_url>
<set_url>http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler&amp;method=text&amp;set=[&quot;!longname!&quot;]</set_url> <set_url>http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler&amp;method=text&amp;set=[&quot;!longname!&quot;]</set_url>
<set import="1"> <set import="1">
@ -294,4 +294,8 @@
<name>ZEN</name> <name>ZEN</name>
<longname>Zendikar</longname> <longname>Zendikar</longname>
</set> </set>
<set import="1">
<name>ROE</name>
<longname>Rise of the Eldrazi</longname>
</set>
</cockatrice_setdatabase> </cockatrice_setdatabase>