From 1d151d2d12d7fe0456dd2ecb326cf737be4016c1 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Thu, 10 Jan 2013 14:31:07 +0100 Subject: [PATCH] cmdDeckSelect fixed --- common/server_database_interface.h | 2 +- common/server_player.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/server_database_interface.h b/common/server_database_interface.h index c12d69f0..10ce082a 100644 --- a/common/server_database_interface.h +++ b/common/server_database_interface.h @@ -19,7 +19,7 @@ public: virtual bool isInIgnoreList(const QString &whoseList, const QString &who) { return false; } virtual ServerInfo_User getUserData(const QString &name, bool withId = false) = 0; virtual void storeGameInformation(const QString &roomName, const QStringList &roomGameTypes, const ServerInfo_Game &gameInfo, const QSet &allPlayersEver, const QSet &allSpectatorsEver, const QList &replayList) { } - virtual DeckList *getDeckFromDatabase(int deckId, const QString &userName) { return 0; } + virtual DeckList *getDeckFromDatabase(int deckId, int userId) { return 0; } virtual qint64 startSession(const QString &userName, const QString &address) { return 0; } public slots: diff --git a/common/server_player.cpp b/common/server_player.cpp index 016de023..a248c4c1 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -630,7 +630,7 @@ Response::ResponseCode Server_Player::cmdDeckSelect(const Command_DeckSelect &cm DeckList *newDeck; if (cmd.has_deck_id()) { try { - newDeck = game->getRoom()->getServer()->getDatabaseInterface()->getDeckFromDatabase(cmd.deck_id(), QString::fromStdString(userInfo->name())); + newDeck = game->getRoom()->getServer()->getDatabaseInterface()->getDeckFromDatabase(cmd.deck_id(), userInfo->id()); } catch(Response::ResponseCode r) { return r; }