single player works again, version bump

cockatrice/cockatrice.pro

@@ -5,7 +5,7 @@ INCLUDEPATH += . src ../common
 MOC_DIR = build
 OBJECTS_DIR = build
 RESOURCES = cockatrice.qrc
-QT += network svg webkit
+QT += network svg
 
 HEADERS += src/counter.h \
  src/dlg_creategame.h \

cockatrice/src/localclient.cpp

@@ -7,6 +7,7 @@ LocalClient::LocalClient(LocalServerInterface *_lsi, const QString &_playerName,
 {
 	connect(lsi, SIGNAL(itemToClient(ProtocolItem *)), this, SLOT(itemFromServer(ProtocolItem *)));
 	sendCommand(new Command_Login(_playerName, QString()));
+	sendCommand(new Command_JoinRoom(0));
 }
 
 LocalClient::~LocalClient()

cockatrice/src/localserver.cpp

@@ -1,9 +1,11 @@
 #include "localserver.h"
 #include "localserverinterface.h"
+#include "server_room.h"
 
 LocalServer::LocalServer(QObject *parent)
 	: Server(parent)
 {
+	addRoom(new Server_Room(0, QString(), QString(), false, QString(), this));
 }
 
 LocalServer::~LocalServer()

cockatrice/src/messagelogwidget.cpp

@@ -181,7 +181,7 @@ void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *s
 {
 	QString startName = startZone->getName();
 	QString targetName = targetZone->getName();
-	if (((startName == "table") && (targetName == "table")) || ((startName == "hand") && (targetName == "hand")))
+	if (((startName == "table") && (targetName == "table") && (startZone == targetZone)) || ((startName == "hand") && (targetName == "hand")))
 		return;
 	QPair<QString, QString> temp = getFromStr(startZone, cardName, oldX);
 	bool cardNameContainsStartZone = false;
@@ -190,6 +190,18 @@ void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *s
 		cardName = temp.first;
 	}
 	QString fromStr = temp.second;
+	QString cardStr;
+	if (cardNameContainsStartZone)
+		cardStr = cardName;
+	else if (cardName.isEmpty())
+		cardStr = tr("a card");
+	else
+		cardStr = QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(cardName));
+
+	if ((startName == "table") && (targetName == "table")) {
+		append(tr("%1 gives %2 control over %3.").arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(targetZone->getPlayer()->getName())).arg(cardStr));
+		return;
+	}
 	
 	QString finalStr;
 	if (targetName == "table")
@@ -214,14 +226,6 @@ void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *s
 	else if (targetName == "stack")
 		finalStr = tr("%1 plays %2%3.");
 	
-	QString cardStr;
-	if (cardNameContainsStartZone)
-		cardStr = cardName;
-	else if (cardName.isEmpty())
-		cardStr = tr("a card");
-	else
-		cardStr = QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(cardName));
-
 	append(finalStr.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr).arg(newX));
 }
 

cockatrice/src/tab_room.cpp

@@ -202,6 +202,10 @@ TabRoom::TabRoom(AbstractClient *_client, const QString &_ownName, ServerInfo_Ro
 	const QList<ServerInfo_User *> users = info->getUserList();
 	for (int i = 0; i < users.size(); ++i)
 		userList->processUserInfo(users[i]);
+	
+	const QList<ServerInfo_Game *> games = info->getGameList();
+	for (int i = 0; i < games.size(); ++i)
+		gameSelector->processGameInfo(games[i]);
 }
 
 TabRoom::~TabRoom()

cockatrice/src/tab_supervisor.cpp

@@ -146,7 +146,7 @@ void TabSupervisor::localGameJoined(Event_GameJoined *event)
 	setCurrentWidget(tab);
 	
 	for (int i = 1; i < localClients.size(); ++i) {
-		Command_JoinGame *cmd = new Command_JoinGame(event->getGameId());
+		Command_JoinGame *cmd = new Command_JoinGame(0, event->getGameId());
 		localClients[i]->sendCommand(cmd);
 	}
 }

cockatrice/src/window_main.cpp

@@ -113,9 +113,9 @@ void MainWindow::actSinglePlayer()
 	}
 	tabSupervisor->startLocal(localClients);
 	
-/*	Command_CreateGame *createCommand = new Command_CreateGame(QString(), QString(), numberPlayers, false, false, false, false);
+	Command_CreateGame *createCommand = new Command_CreateGame(0, QString(), QString(), numberPlayers, false, false, false, false);
 	mainClient->sendCommand(createCommand);
-*/}
+}
 
 void MainWindow::localGameEnded()
 {

common/protocol.h

@@ -54,7 +54,7 @@ private:
 	static void initializeHashAuto();
 	bool receiverMayDelete;
 public:
-	static const int protocolVersion = 10;
+	static const int protocolVersion = 11;
 	static void initializeHash();
 	virtual int getItemId() const = 0;
 	bool getReceiverMayDelete() const { return receiverMayDelete; }

servatrice/src/servatrice.cpp

@@ -209,4 +209,4 @@ void Servatrice::statusUpdate()
 	execSqlQuery(query);
 }
 
-const QString Servatrice::versionString = "Servatrice 0.20101116";
+const QString Servatrice::versionString = "Servatrice 0.20110103";