From cb045907cbf036a78bc0c68a1419a567ed40b457 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Fri, 16 Apr 2010 16:15:27 +0200
Subject: [PATCH] minor fixes; ROE set added

---
 cockatrice/src/carditem.cpp         |  5 ++++-
 cockatrice/src/playerlistwidget.cpp | 11 ++++++-----
 common/serializable_item.h          |  1 +
 oracle/sets.xml                     |  6 +++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp
index 566f103d..923a2dc9 100644
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/carditem.cpp
@@ -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;
diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp
index cf7a7aec..002e8fc7 100644
--- a/cockatrice/src/playerlistwidget.cpp
+++ b/cockatrice/src/playerlistwidget.cpp
@@ -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);
 }
 
diff --git a/common/serializable_item.h b/common/serializable_item.h
index 31bb16db..54dd44a1 100644
--- a/common/serializable_item.h
+++ b/common/serializable_item.h
@@ -1,6 +1,7 @@
 #ifndef SERIALIZABLE_ITEM_H
 #define SERIALIZABLE_ITEM_H
 
+#include <QtCore/QXmlStreamWriter>
 #include <QObject>
 #include <QMap>
 #include <QList>
diff --git a/oracle/sets.xml b/oracle/sets.xml
index e6c4d9d1..db13d023 100644
--- a/oracle/sets.xml
+++ b/oracle/sets.xml
@@ -1,5 +1,5 @@
 <?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>
 	<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">
@@ -294,4 +294,8 @@
             <name>ZEN</name>
             <longname>Zendikar</longname>
         </set>
+        <set import="1">
+            <name>ROE</name>
+            <longname>Rise of the Eldrazi</longname>
+        </set>
 </cockatrice_setdatabase>