Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

cockatrice/cockatrice.pro

@@ -174,7 +174,8 @@ TRANSLATIONS += \
 	translations/cockatrice_pt.ts \
 	translations/cockatrice_pt-br.ts \
 	translations/cockatrice_fr.ts \
-	translations/cockatrice_ja.ts
+	translations/cockatrice_ja.ts \
+	translations/cockatrice_ru.ts
 win32 {
 	RC_FILE = cockatrice.rc
 }

cockatrice/cockatrice.qrc

@@ -24,13 +24,6 @@
 	<file>resources/icon_search.svg</file>
 	<file>resources/icon_clearsearch.svg</file>
         <file>resources/hr.jpg</file>
-        <file>translations/cockatrice_de.qm</file>
-        <file>translations/cockatrice_en.qm</file>
-	<file>translations/cockatrice_es.qm</file>
-	<file>translations/cockatrice_pt.qm</file>
-	<file>translations/cockatrice_pt-br.qm</file>
-	<file>translations/cockatrice_fr.qm</file>
-	<file>translations/cockatrice_ja.qm</file>
         <file>resources/appicon.svg</file>
         <file>resources/add_to_sideboard.svg</file>
         <file>resources/decrement.svg</file>
@@ -44,6 +37,15 @@
 	<file>resources/icon_player.svg</file>
 	<file>resources/icon_spectator.svg</file>
 
+        <file>translations/cockatrice_de.qm</file>
+        <file>translations/cockatrice_en.qm</file>
+	<file>translations/cockatrice_es.qm</file>
+	<file>translations/cockatrice_pt.qm</file>
+	<file>translations/cockatrice_pt-br.qm</file>
+	<file>translations/cockatrice_fr.qm</file>
+	<file>translations/cockatrice_ja.qm</file>
+	<file>translations/cockatrice_ru.qm</file>
+
 	<file>resources/countries/at.svg</file>
 	<file>resources/countries/au.svg</file>
 	<file>resources/countries/be.svg</file>

cockatrice/src/abstractcounter.cpp

@@ -97,13 +97,13 @@ void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event)
 		event->ignore();
 }
 
-void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent * /*event*/)
 {
 	hovered = true;
 	update();
 }
 
-void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/)
 {
 	hovered = false;
 	update();

cockatrice/src/chatview.cpp

@@ -8,35 +8,37 @@ ChatView::ChatView(const QString &_ownName, QWidget *parent)
 	: QTextEdit(parent), ownName(_ownName)
 {
 	setTextInteractionFlags(Qt::TextSelectableByMouse);
-	
-	QTextTableFormat format;
-	format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
-	table = textCursor().insertTable(1, 3, format);
 }
 
 void ChatView::appendMessage(const QString &sender, const QString &message)
 {
-	QTextCursor cellCursor = table->cellAt(table->rows() - 1, 0).lastCursorPosition();
-	cellCursor.insertText(QDateTime::currentDateTime().toString("[hh:mm]"));
-	QTextTableCell senderCell = table->cellAt(table->rows() - 1, 1);
+	QTextCursor cursor(document()->lastBlock());
+	cursor.movePosition(QTextCursor::End);
+	
+	QTextBlockFormat blockFormat;
+	blockFormat.setBottomMargin(3);
+	cursor.insertBlock(blockFormat);
+	
+	QTextCharFormat timeFormat;
+	timeFormat.setForeground(Qt::black);
+	cursor.setCharFormat(timeFormat);
+	cursor.insertText(QDateTime::currentDateTime().toString("[hh:mm] "));
+	
 	QTextCharFormat senderFormat;
 	if (sender == ownName) {
 		senderFormat.setFontWeight(QFont::Bold);
 		senderFormat.setForeground(Qt::red);
 	} else
 		senderFormat.setForeground(Qt::blue);
-	senderCell.setFormat(senderFormat);
-	cellCursor = senderCell.lastCursorPosition();
-	cellCursor.insertText(sender);
-	QTextTableCell messageCell = table->cellAt(table->rows() - 1, 2);
+	cursor.setCharFormat(senderFormat);
+	cursor.insertText(sender + " ");
+	
 	QTextCharFormat messageFormat;
 	if (sender.isEmpty())
 		messageFormat.setForeground(Qt::darkGreen);
-	messageCell.setFormat(messageFormat);
-	cellCursor = messageCell.lastCursorPosition();
-	cellCursor.insertText(message);
+	cursor.setCharFormat(messageFormat);
+	cursor.insertText(message);
 	
-	table->appendRows(1);
 	
 	verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-}
\ No newline at end of file
+}

cockatrice/src/dlg_creategame.cpp

@@ -11,8 +11,8 @@
 #include "dlg_creategame.h"
 #include "protocol_items.h"
 
-DlgCreateGame::DlgCreateGame(AbstractClient *_client, int _roomId, QWidget *parent)
-	: QDialog(parent), client(_client), roomId(_roomId)
+DlgCreateGame::DlgCreateGame(AbstractClient *_client, int _roomId, const QMap<int, QString> &_gameTypes, QWidget *parent)
+	: QDialog(parent), client(_client), roomId(_roomId), gameTypes(_gameTypes)
 {
 	descriptionLabel = new QLabel(tr("&Description:"));
 	descriptionEdit = new QLineEdit;
@@ -29,6 +29,17 @@ DlgCreateGame::DlgCreateGame(AbstractClient *_client, int _roomId, QWidget *pare
 	maxPlayersEdit->setValue(2);
 	maxPlayersLabel->setBuddy(maxPlayersEdit);
 	
+	QVBoxLayout *gameTypeLayout = new QVBoxLayout;
+	QMapIterator<int, QString> gameTypeIterator(gameTypes);
+	while (gameTypeIterator.hasNext()) {
+		gameTypeIterator.next();
+		QCheckBox *gameTypeCheckBox = new QCheckBox(gameTypeIterator.value());
+		gameTypeLayout->addWidget(gameTypeCheckBox);
+		gameTypeCheckBoxes.insert(gameTypeIterator.key(), gameTypeCheckBox);
+	}
+	QGroupBox *gameTypeGroupBox = new QGroupBox(tr("Game type"));
+	gameTypeGroupBox->setLayout(gameTypeLayout);
+	
 	spectatorsAllowedCheckBox = new QCheckBox(tr("&Spectators allowed"));
 	spectatorsAllowedCheckBox->setChecked(true);
 	connect(spectatorsAllowedCheckBox, SIGNAL(stateChanged(int)), this, SLOT(spectatorsAllowedChanged(int)));
@@ -50,7 +61,8 @@ DlgCreateGame::DlgCreateGame(AbstractClient *_client, int _roomId, QWidget *pare
 	grid->addWidget(passwordEdit, 1, 1);
 	grid->addWidget(maxPlayersLabel, 2, 0);
 	grid->addWidget(maxPlayersEdit, 2, 1);
-	grid->addWidget(spectatorsGroupBox, 3, 0, 1, 2);
+	grid->addWidget(gameTypeGroupBox, 3, 0, 1, 2);
+	grid->addWidget(spectatorsGroupBox, 4, 0, 1, 2);
 
 	okButton = new QPushButton(tr("&OK"));
 	okButton->setDefault(true);
@@ -76,11 +88,20 @@ DlgCreateGame::DlgCreateGame(AbstractClient *_client, int _roomId, QWidget *pare
 
 void DlgCreateGame::actOK()
 {
+	QList<GameTypeId *> gameTypeList;
+	QMapIterator<int, QCheckBox *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
+	while (gameTypeCheckBoxIterator.hasNext()) {
+		gameTypeCheckBoxIterator.next();
+		if (gameTypeCheckBoxIterator.value()->isChecked())
+			gameTypeList.append(new GameTypeId(gameTypeCheckBoxIterator.key()));
+	}
+	
 	Command_CreateGame *createCommand = new Command_CreateGame(
 		roomId,
 		descriptionEdit->text(),
 		passwordEdit->text(),
 		maxPlayersEdit->value(),
+		gameTypeList,
 		spectatorsAllowedCheckBox->isChecked(),
 		spectatorsNeedPasswordCheckBox->isChecked(),
 		spectatorsCanTalkCheckBox->isChecked(),

cockatrice/src/dlg_creategame.h

@@ -14,7 +14,7 @@ class QSpinBox;
 class DlgCreateGame : public QDialog {
 	Q_OBJECT
 public:
-	DlgCreateGame(AbstractClient *_client, int _roomId, QWidget *parent = 0);
+	DlgCreateGame(AbstractClient *_client, int _roomId, const QMap<int, QString> &_gameTypes, QWidget *parent = 0);
 private slots:
 	void actOK();
 	void checkResponse(ResponseCode response);
@@ -22,6 +22,8 @@ private slots:
 private:
 	AbstractClient *client;
 	int roomId;
+	QMap<int, QString> gameTypes;
+	QMap<int, QCheckBox *> gameTypeCheckBoxes;
 
 	QGroupBox *spectatorsGroupBox;
 	QLabel *descriptionLabel, *passwordLabel, *maxPlayersLabel;

cockatrice/src/gamesmodel.cpp

 #include "gamesmodel.h"
 #include "protocol_datastructures.h"
 
+GamesModel::GamesModel(const QMap<int, QString> &_gameTypes, QObject *parent)
+	: QAbstractTableModel(parent), gameTypes(_gameTypes)
+{
+}
+
 GamesModel::~GamesModel()
 {
 	if (!gameList.isEmpty()) {
@@ -27,9 +32,16 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
 	switch (index.column()) {
 		case 0: return g->getDescription();
 		case 1: return g->getCreatorInfo()->getName();
-		case 2: return g->getHasPassword() ? (g->getSpectatorsNeedPassword() ? tr("yes") : tr("yes, free for spectators")) : tr("no");
-		case 3: return QString("%1/%2").arg(g->getPlayerCount()).arg(g->getMaxPlayers());
-		case 4: return g->getSpectatorsAllowed() ? QVariant(g->getSpectatorCount()) : QVariant(tr("not allowed"));
+		case 2: {
+			QStringList result;
+			QList<GameTypeId *> gameTypeList = g->getGameTypes();
+			for (int i = 0; i < gameTypeList.size(); ++i)
+				result.append(gameTypes.value(gameTypeList[i]->getData()));
+			return result.join(", ");
+		}
+		case 3: return g->getHasPassword() ? (g->getSpectatorsNeedPassword() ? tr("yes") : tr("yes, free for spectators")) : tr("no");
+		case 4: return QString("%1/%2").arg(g->getPlayerCount()).arg(g->getMaxPlayers());
+		case 5: return g->getSpectatorsAllowed() ? QVariant(g->getSpectatorCount()) : QVariant(tr("not allowed"));
 		default: return QVariant();
 	}
 }
@@ -41,9 +53,10 @@ QVariant GamesModel::headerData(int section, Qt::Orientation orientation, int ro
 	switch (section) {
 		case 0: return tr("Description");
 		case 1: return tr("Creator");
-		case 2: return tr("Password");
-		case 3: return tr("Players");
-		case 4: return tr("Spectators");
+		case 2: return tr("Game type");
+		case 3: return tr("Password");
+		case 4: return tr("Players");
+		case 5: return tr("Spectators");
 		default: return QVariant();
 	}
 }
@@ -56,7 +69,11 @@ ServerInfo_Game *GamesModel::getGame(int row)
 
 void GamesModel::updateGameList(ServerInfo_Game *_game)
 {
-	ServerInfo_Game *game = new ServerInfo_Game(_game->getGameId(), _game->getDescription(), _game->getHasPassword(), _game->getPlayerCount(), _game->getMaxPlayers(), new ServerInfo_User(_game->getCreatorInfo()), _game->getSpectatorsAllowed(), _game->getSpectatorsNeedPassword(), _game->getSpectatorCount());
+	QList<GameTypeId *> gameTypeList, oldGameTypeList = _game->getGameTypes();
+	for (int i = 0; i < oldGameTypeList.size(); ++i)
+		gameTypeList.append(new GameTypeId(oldGameTypeList[i]->getData()));
+	
+	ServerInfo_Game *game = new ServerInfo_Game(_game->getGameId(), _game->getDescription(), _game->getHasPassword(), _game->getPlayerCount(), _game->getMaxPlayers(), gameTypeList, new ServerInfo_User(_game->getCreatorInfo()), _game->getSpectatorsAllowed(), _game->getSpectatorsNeedPassword(), _game->getSpectatorCount());
 	for (int i = 0; i < gameList.size(); i++)
 		if (gameList[i]->getGameId() == game->getGameId()) {
 			if (game->getPlayerCount() == 0) {

cockatrice/src/gamesmodel.h

@@ -9,8 +9,11 @@ class ServerInfo_Game;
 
 class GamesModel : public QAbstractTableModel {
 	Q_OBJECT
+private:
+	QList<ServerInfo_Game *> gameList;
+	QMap<int, QString> gameTypes;
 public:
-	GamesModel(QObject *parent = 0) : QAbstractTableModel(parent) { }
+	GamesModel(const QMap<int, QString> &_gameTypes, QObject *parent = 0);
 	~GamesModel();
 	int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : gameList.size(); }
 	int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 5; }
@@ -19,8 +22,6 @@ public:
 	
 	ServerInfo_Game *getGame(int row);
 	void updateGameList(ServerInfo_Game *game);
-private:
-	QList<ServerInfo_Game *> gameList;
 };
 
 class GamesProxyModel : public QSortFilterProxyModel {

cockatrice/src/localserver.cpp

@@ -5,7 +5,7 @@
 LocalServer::LocalServer(QObject *parent)
 	: Server(parent)
 {
-	addRoom(new Server_Room(0, QString(), QString(), false, QString(), this));
+	addRoom(new Server_Room(0, QString(), QString(), false, QString(), QStringList(), this));
 }
 
 LocalServer::~LocalServer()

cockatrice/src/messagelogwidget.cpp

@@ -138,6 +138,14 @@ void MessageLogWidget::logDrawCards(Player *player, int number)
 		append(tr("%1 draws %2 cards.").arg(sanitizeHtml(player->getName())).arg(number));
 }
 
+void MessageLogWidget::logUndoDraw(Player *player, QString cardName)
+{
+	if (cardName.isEmpty())
+		append(tr("%1 undoes his last draw.").arg(sanitizeHtml(player->getName())));
+	else
+		append(tr("%1 undoes his last draw (%2).").arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(cardName)));
+}
+
 QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString cardName, int position) const
 {
 	bool cardNameContainsStartZone = false;
@@ -428,6 +436,7 @@ void MessageLogWidget::connectToPlayer(Player *player)
 	connect(player, SIGNAL(logDumpZone(Player *, CardZone *, int)), this, SLOT(logDumpZone(Player *, CardZone *, int)));
 	connect(player, SIGNAL(logStopDumpZone(Player *, CardZone *)), this, SLOT(logStopDumpZone(Player *, CardZone *)));
 	connect(player, SIGNAL(logDrawCards(Player *, int)), this, SLOT(logDrawCards(Player *, int)));
+	connect(player, SIGNAL(logUndoDraw(Player *, QString)), this, SLOT(logUndoDraw(Player *, QString)));
 	connect(player, SIGNAL(logRevealCards(Player *, CardZone *, int, QString, Player *)), this, SLOT(logRevealCards(Player *, CardZone *, int, QString, Player *)));
 }
 

cockatrice/src/messagelogwidget.h

@@ -47,6 +47,7 @@ public slots:
 	void logShuffle(Player *player);
 	void logRollDie(Player *player, int sides, int roll);
 	void logDrawCards(Player *player, int number);
+	void logUndoDraw(Player *player, QString cardName);
 	void logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
 	void logFlipCard(Player *player, QString cardName, bool faceDown);
 	void logDestroyCard(Player *player, QString cardName);

cockatrice/src/player.cpp

@@ -130,6 +130,8 @@ Player::Player(ServerInfo_User *info, int _id, bool _local, TabGame *_parent)
 		connect(aDrawCard, SIGNAL(triggered()), this, SLOT(actDrawCard()));
 		aDrawCards = new QAction(this);
 		connect(aDrawCards, SIGNAL(triggered()), this, SLOT(actDrawCards()));
+		aUndoDraw = new QAction(this);
+		connect(aUndoDraw, SIGNAL(triggered()), this, SLOT(actUndoDraw()));
 		aShuffle = new QAction(this);
 		connect(aShuffle, SIGNAL(triggered()), this, SLOT(actShuffle()));
                 aMulligan = new QAction(this);
@@ -159,6 +161,7 @@ Player::Player(ServerInfo_User *info, int _id, bool _local, TabGame *_parent)
 		libraryMenu = playerMenu->addMenu(QString());
 		libraryMenu->addAction(aDrawCard);
 		libraryMenu->addAction(aDrawCards);
+		libraryMenu->addAction(aUndoDraw);
 		libraryMenu->addSeparator();
 		libraryMenu->addAction(aShuffle);
 		libraryMenu->addSeparator();
@@ -409,6 +412,7 @@ void Player::retranslateUi()
 		aViewSideboard->setText(tr("&View sideboard"));
 		aDrawCard->setText(tr("&Draw card"));
 		aDrawCards->setText(tr("D&raw cards..."));
+		aUndoDraw->setText(tr("&Undo last draw"));
 		aMulligan->setText(tr("Take &mulligan"));
 		aShuffle->setText(tr("&Shuffle"));
 		aMoveTopCardsToGrave->setText(tr("Move top cards to &graveyard..."));
@@ -447,11 +451,13 @@ void Player::setShortcutsActive()
 {
 	shortcutsActive = true;
 	
+	aViewSideboard->setShortcut(tr("Ctrl+F3"));
 	aViewLibrary->setShortcut(tr("F3"));
 	aViewTopCards->setShortcut(tr("Ctrl+W"));
 	aViewGraveyard->setShortcut(tr("F4"));
 	aDrawCard->setShortcut(tr("Ctrl+D"));
 	aDrawCards->setShortcut(tr("Ctrl+E"));
+	aUndoDraw->setShortcut(tr("Ctrl+Shift+D"));
 	aMulligan->setShortcut(tr("Ctrl+M"));
 	aShuffle->setShortcut(tr("Ctrl+S"));
 	aUntapAll->setShortcut(tr("Ctrl+U"));
@@ -468,11 +474,13 @@ void Player::setShortcutsInactive()
 {
 	shortcutsActive = false;
 	
+	aViewSideboard->setShortcut(QKeySequence());
 	aViewLibrary->setShortcut(QKeySequence());
 	aViewTopCards->setShortcut(QKeySequence());
 	aViewGraveyard->setShortcut(QKeySequence());
 	aDrawCard->setShortcut(QKeySequence());
 	aDrawCards->setShortcut(QKeySequence());
+	aUndoDraw->setShortcut(QKeySequence());
 	aMulligan->setShortcut(QKeySequence());
 	aShuffle->setShortcut(QKeySequence());
 	aUntapAll->setShortcut(QKeySequence());
@@ -553,6 +561,11 @@ void Player::actDrawCards()
 		sendGameCommand(new Command_DrawCards(-1, number));
 }
 
+void Player::actUndoDraw()
+{
+	sendGameCommand(new Command_UndoDraw);
+}
+
 void Player::actMoveTopCardsToGrave()
 {
 	int number = QInputDialog::getInteger(0, tr("Move top cards to grave"), tr("Number:"));
@@ -791,7 +804,7 @@ void Player::eventStopDumpZone(Event_StopDumpZone *event)
 	emit logStopDumpZone(this, zone);
 }
 
-void Player::eventMoveCard(Event_MoveCard *event)
+void Player::eventMoveCard(Event_MoveCard *event, GameEventContext *context)
 {
 	CardZone *startZone = zones.value(event->getStartZone(), 0);
 	Player *targetPlayer = static_cast<TabGame *>(parent())->getPlayers().value(event->getTargetPlayerId());
@@ -838,7 +851,13 @@ void Player::eventMoveCard(Event_MoveCard *event)
 
 	// The log event has to be sent before the card is added to the target zone
 	// because the addCard function can modify the card object.
-	emit logMoveCard(this, card->getName(), startZone, logPosition, targetZone, logX);
+	if (context)
+		switch (context->getItemId()) {
+			case ItemId_Context_UndoDraw: emit logUndoDraw(this, card->getName()); break;
+			default: ;
+		}
+	else
+		emit logMoveCard(this, card->getName(), startZone, logPosition, targetZone, logX);
 
 	targetZone->addCard(card, true, x, y);
 
@@ -981,25 +1000,25 @@ void Player::processGameEvent(GameEvent *event, GameEventContext *context)
 {
 	qDebug() << "player event: id=" << event->getItemId();
 	switch (event->getItemId()) {
-		case ItemId_Event_Say: eventSay(qobject_cast<Event_Say *>(event)); break;
-		case ItemId_Event_Shuffle: eventShuffle(qobject_cast<Event_Shuffle *>(event)); break;
-		case ItemId_Event_RollDie: eventRollDie(qobject_cast<Event_RollDie *>(event)); break;
-		case ItemId_Event_CreateArrows: eventCreateArrows(qobject_cast<Event_CreateArrows *>(event)); break;
-		case ItemId_Event_DeleteArrow: eventDeleteArrow(qobject_cast<Event_DeleteArrow *>(event)); break;
-		case ItemId_Event_CreateToken: eventCreateToken(qobject_cast<Event_CreateToken *>(event)); break;
-		case ItemId_Event_SetCardAttr: eventSetCardAttr(qobject_cast<Event_SetCardAttr *>(event)); break;
-		case ItemId_Event_SetCardCounter: eventSetCardCounter(qobject_cast<Event_SetCardCounter *>(event)); break;
-		case ItemId_Event_CreateCounters: eventCreateCounters(qobject_cast<Event_CreateCounters *>(event)); break;
-		case ItemId_Event_SetCounter: eventSetCounter(qobject_cast<Event_SetCounter *>(event)); break;
-		case ItemId_Event_DelCounter: eventDelCounter(qobject_cast<Event_DelCounter *>(event)); break;
-		case ItemId_Event_DumpZone: eventDumpZone(qobject_cast<Event_DumpZone *>(event)); break;
-		case ItemId_Event_StopDumpZone: eventStopDumpZone(qobject_cast<Event_StopDumpZone *>(event)); break;
-		case ItemId_Event_MoveCard: eventMoveCard(qobject_cast<Event_MoveCard *>(event)); break;
-		case ItemId_Event_FlipCard: eventFlipCard(qobject_cast<Event_FlipCard *>(event)); break;
-		case ItemId_Event_DestroyCard: eventDestroyCard(qobject_cast<Event_DestroyCard *>(event)); break;
-		case ItemId_Event_AttachCard: eventAttachCard(qobject_cast<Event_AttachCard *>(event)); break;
-		case ItemId_Event_DrawCards: eventDrawCards(qobject_cast<Event_DrawCards *>(event)); break;
-		case ItemId_Event_RevealCards: eventRevealCards(qobject_cast<Event_RevealCards *>(event)); break;
+		case ItemId_Event_Say: eventSay(static_cast<Event_Say *>(event)); break;
+		case ItemId_Event_Shuffle: eventShuffle(static_cast<Event_Shuffle *>(event)); break;
+		case ItemId_Event_RollDie: eventRollDie(static_cast<Event_RollDie *>(event)); break;
+		case ItemId_Event_CreateArrows: eventCreateArrows(static_cast<Event_CreateArrows *>(event)); break;
+		case ItemId_Event_DeleteArrow: eventDeleteArrow(static_cast<Event_DeleteArrow *>(event)); break;
+		case ItemId_Event_CreateToken: eventCreateToken(static_cast<Event_CreateToken *>(event)); break;
+		case ItemId_Event_SetCardAttr: eventSetCardAttr(static_cast<Event_SetCardAttr *>(event)); break;
+		case ItemId_Event_SetCardCounter: eventSetCardCounter(static_cast<Event_SetCardCounter *>(event)); break;
+		case ItemId_Event_CreateCounters: eventCreateCounters(static_cast<Event_CreateCounters *>(event)); break;
+		case ItemId_Event_SetCounter: eventSetCounter(static_cast<Event_SetCounter *>(event)); break;
+		case ItemId_Event_DelCounter: eventDelCounter(static_cast<Event_DelCounter *>(event)); break;
+		case ItemId_Event_DumpZone: eventDumpZone(static_cast<Event_DumpZone *>(event)); break;
+		case ItemId_Event_StopDumpZone: eventStopDumpZone(static_cast<Event_StopDumpZone *>(event)); break;
+		case ItemId_Event_MoveCard: eventMoveCard(static_cast<Event_MoveCard *>(event), context); break;
+		case ItemId_Event_FlipCard: eventFlipCard(static_cast<Event_FlipCard *>(event)); break;
+		case ItemId_Event_DestroyCard: eventDestroyCard(static_cast<Event_DestroyCard *>(event)); break;
+		case ItemId_Event_AttachCard: eventAttachCard(static_cast<Event_AttachCard *>(event)); break;
+		case ItemId_Event_DrawCards: eventDrawCards(static_cast<Event_DrawCards *>(event)); break;
+		case ItemId_Event_RevealCards: eventRevealCards(static_cast<Event_RevealCards *>(event)); break;
 		default: {
 			qDebug() << "unhandled game event";
 		}

cockatrice/src/player.h

@@ -57,6 +57,7 @@ signals:
 	void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool _playerTarget);
 	void logCreateToken(Player *player, QString cardName, QString pt);
 	void logDrawCards(Player *player, int number);
+	void logUndoDraw(Player *player, QString cardName);
 	void logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
 	void logFlipCard(Player *player, QString cardName, bool faceDown);
 	void logDestroyCard(Player *player, QString cardName);
@@ -81,6 +82,7 @@ public slots:
 	void actShuffle();
 	void actDrawCard();
 	void actDrawCards();
+	void actUndoDraw();
         void actMulligan();
 	void actMoveTopCardsToGrave();
 	void actMoveTopCardsToExile();
@@ -119,7 +121,7 @@ private:
 		*aMoveRfgToTopLibrary, *aMoveRfgToBottomLibrary, *aMoveRfgToHand, *aMoveRfgToGrave,
 		*aViewLibrary, *aViewTopCards, *aMoveTopCardsToGrave, *aMoveTopCardsToExile, *aMoveTopCardToBottom,
 		*aViewGraveyard, *aViewRfg, *aViewSideboard,
-                *aDrawCard, *aDrawCards, *aMulligan, *aShuffle,
+                *aDrawCard, *aDrawCards, *aUndoDraw, *aMulligan, *aShuffle,
 		*aUntapAll, *aRollDie, *aCreateToken, *aCreateAnotherToken,
 		*aCardMenu;
 
@@ -167,7 +169,7 @@ private:
 	void eventDelCounter(Event_DelCounter *event);
 	void eventDumpZone(Event_DumpZone *event);
 	void eventStopDumpZone(Event_StopDumpZone *event);
-	void eventMoveCard(Event_MoveCard *event);
+	void eventMoveCard(Event_MoveCard *event, GameEventContext *context);
 	void eventFlipCard(Event_FlipCard *event);
 	void eventDestroyCard(Event_DestroyCard *event);
 	void eventAttachCard(Event_AttachCard *event);

cockatrice/src/tab_room.cpp

@@ -17,15 +17,16 @@
 #include "gamesmodel.h"
 #include "chatview.h"
 
-GameSelector::GameSelector(AbstractClient *_client, int _roomId, QWidget *parent)
-	: QGroupBox(parent), client(_client), roomId(_roomId)
+GameSelector::GameSelector(AbstractClient *_client, TabRoom *_room, QWidget *parent)
+	: QGroupBox(parent), client(_client), room(_room)
 {
 	gameListView = new QTreeView;
-	gameListModel = new GamesModel(this);
+	gameListModel = new GamesModel(room->getGameTypes(), this);
 	gameListProxyModel = new GamesProxyModel(this);
 	gameListProxyModel->setSourceModel(gameListModel);
 	gameListView->setModel(gameListProxyModel);
 	gameListView->header()->setResizeMode(0, QHeaderView::ResizeToContents);
+	gameListView->setSortingEnabled(true);
 
 	showFullGamesCheckBox = new QCheckBox;
 	createButton = new QPushButton;
@@ -61,7 +62,7 @@ void GameSelector::showFullGamesChanged(int state)
 
 void GameSelector::actCreate()
 {
-	DlgCreateGame dlg(client, roomId, this);
+	DlgCreateGame dlg(client, room->getRoomId(), room->getGameTypes(), this);
 	dlg.exec();
 }
 
@@ -96,7 +97,7 @@ void GameSelector::actJoin()
 			return;
 	}
 
-	Command_JoinGame *commandJoinGame = new Command_JoinGame(roomId, game->getGameId(), password, spectator);
+	Command_JoinGame *commandJoinGame = new Command_JoinGame(room->getRoomId(), game->getGameId(), password, spectator);
 	connect(commandJoinGame, SIGNAL(finished(ResponseCode)), this, SLOT(checkResponse(ResponseCode)));
 	client->sendCommand(commandJoinGame);
 
@@ -122,7 +123,11 @@ void GameSelector::processGameInfo(ServerInfo_Game *info)
 TabRoom::TabRoom(AbstractClient *_client, const QString &_ownName, ServerInfo_Room *info)
 	: Tab(), client(_client), roomId(info->getRoomId()), roomName(info->getName()), ownName(_ownName)
 {
-	gameSelector = new GameSelector(client, roomId);
+	const QList<ServerInfo_GameType *> gameTypeList = info->getGameTypeList();
+	for (int i = 0; i < gameTypeList.size(); ++i)
+		gameTypes.insert(gameTypeList[i]->getGameTypeId(), gameTypeList[i]->getDescription());
+	
+	gameSelector = new GameSelector(client, this);
 	userList = new UserList(client, false);
 	connect(userList, SIGNAL(openMessageDialog(const QString &, bool)), this, SIGNAL(openMessageDialog(const QString &, bool)));
 	
@@ -226,14 +231,12 @@ void TabRoom::processListGamesEvent(Event_ListGames *event)
 
 void TabRoom::processJoinRoomEvent(Event_JoinRoom *event)
 {
-	chatView->appendMessage(QString(), tr("%1 has joined the room.").arg(event->getUserInfo()->getName()));
 	userList->processUserInfo(event->getUserInfo());
 	userList->sortItems();
 }
 
 void TabRoom::processLeaveRoomEvent(Event_LeaveRoom *event)
 {
-	chatView->appendMessage(QString(), tr("%1 has left the room.").arg(event->getPlayerName()));
 	userList->deleteUser(event->getPlayerName());
 }
 

cockatrice/src/tab_room.h

@@ -23,6 +23,7 @@ class Event_ListGames;
 class Event_JoinRoom;
 class Event_LeaveRoom;
 class Event_RoomSay;
+class TabRoom;
 
 class GameSelector : public QGroupBox {
 	Q_OBJECT
@@ -35,7 +36,7 @@ signals:
 	void gameJoined(int gameId);
 private:
 	AbstractClient *client;
-	int roomId;
+	TabRoom *room;
 
 	QTreeView *gameListView;
 	GamesModel *gameListModel;
@@ -43,7 +44,7 @@ private:
 	QPushButton *createButton, *joinButton, *spectateButton;
 	QCheckBox *showFullGamesCheckBox;
 public:
-	GameSelector(AbstractClient *_client, int _roomId, QWidget *parent = 0);
+	GameSelector(AbstractClient *_client, TabRoom *_room, QWidget *parent = 0);
 	void retranslateUi();
 	void processGameInfo(ServerInfo_Game *info);
 };
@@ -55,6 +56,7 @@ private:
 	int roomId;
 	QString roomName;
 	QString ownName;
+	QMap<int, QString> gameTypes;
 	
 	GameSelector *gameSelector;
 	UserList *userList;
@@ -82,6 +84,7 @@ public:
 	void retranslateUi();
 	void processRoomEvent(RoomEvent *event);
 	int getRoomId() const { return roomId; }
+	const QMap<int, QString> &getGameTypes() const { return gameTypes; }
 	QString getChannelName() const { return roomName; }
 	QString getTabText() const { return roomName; }
 };

cockatrice/src/userlist.cpp

@@ -8,7 +8,7 @@
 #include <QMenu>
 
 UserListItemDelegate::UserListItemDelegate(QObject *const parent)
-	: QItemDelegate(parent)
+	: QStyledItemDelegate(parent)
 {
 }
 
@@ -21,7 +21,7 @@ bool UserListItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
 			return true;
 		}
 	}
-	return QItemDelegate::editorEvent(event, model, option, index);
+	return QStyledItemDelegate::editorEvent(event, model, option, index);
 }
 
 UserListTWI::UserListTWI()

cockatrice/src/userlist.h

@@ -3,13 +3,13 @@
 
 #include <QGroupBox>
 #include <QTreeWidgetItem>
-#include <QItemDelegate>
+#include <QStyledItemDelegate>
 
 class QTreeWidget;
 class ServerInfo_User;
 class AbstractClient;
 
-class UserListItemDelegate : public QItemDelegate {
+class UserListItemDelegate : public QStyledItemDelegate {
 public:
 	UserListItemDelegate(QObject *const parent);
 	bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);

cockatrice/src/window_main.cpp

@@ -113,7 +113,7 @@ void MainWindow::actSinglePlayer()
 	}
 	tabSupervisor->startLocal(localClients);
 	
-	Command_CreateGame *createCommand = new Command_CreateGame(0, QString(), QString(), numberPlayers, false, false, false, false);
+	Command_CreateGame *createCommand = new Command_CreateGame(0, QString(), QString(), numberPlayers, QList<GameTypeId *>(), false, false, false, false);
 	mainClient->sendCommand(createCommand);
 }
 
@@ -186,7 +186,10 @@ void MainWindow::socketError(const QString &errorStr)
 
 void MainWindow::protocolVersionMismatch(int localVersion, int remoteVersion)
 {
-	QMessageBox::critical(this, tr("Error"), tr("Protocol version mismatch. Local version: %1, remote version: %2.").arg(localVersion).arg(remoteVersion));
+	if (localVersion > remoteVersion)
+		QMessageBox::critical(this, tr("Error"), tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.\nLocal version is %1, remote version is %2.").arg(localVersion).arg(remoteVersion));
+	else
+		QMessageBox::critical(this, tr("Error"), tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\nLocal version is %1, remote version is %2.").arg(localVersion).arg(remoteVersion));
 }
 
 void MainWindow::setClientStatusTitle()