jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 19:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

always get next game/replay id from database to avoid id collisions in multi-server mode

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-03-17 23:01:56 +01:00
parent 9706ecd98a
commit c9a8429044
5 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/server.h
View file

@ -38,8 +38,8 @@ public:
~Server();
AuthenticationResult loginUser(Server_ProtocolHandler *session, QString &name, const QString &password, QString &reason);
const QMap<int, Server_Room *> &getRooms() { return rooms; }
int getNextGameId() { return nextGameId++; }
int getNextReplayId() { return nextReplayId++; }
virtual int getNextGameId() { return nextGameId++; }
virtual int getNextReplayId() { return nextReplayId++; }
const QMap<QString, Server_ProtocolHandler *> &getUsers() const { return users; }
void addClient(Server_ProtocolHandler *player);
@ -61,7 +61,7 @@ public:
virtual bool isInIgnoreList(const QString &whoseList, const QString &who) { return false; }
virtual void storeGameInformation(int secondsElapsed, const QSet<QString> &allPlayersEver, const QSet<QString> &allSpectatorsEver, const QList<GameReplay *> &replays) { }
virtual DeckList *getDeckFromDatabase(int deckId, const QString &userName) = 0;
virtual DeckList *getDeckFromDatabase(int deckId, const QString &userName) { return 0; }
void sendIslMessage(const Response &item, int serverId = -1);
void sendIslMessage(const SessionEvent &item, int serverId = -1);

3
common/server_player.cpp
View file

@ -649,6 +649,9 @@ Response::ResponseCode Server_Player::cmdDeckSelect(const Command_DeckSelect &cm
} else
newDeck = new DeckList(QString::fromStdString(cmd.deck()));
if (!newDeck)
return Response::RespInternalError;
delete deck;
deck = newDeck;