sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert ProtoBuf to version 2.6.1 and running astyle

Browse Source
This commit is contained in:
Albert Medela
2016-07-12 18:36:25 +02:00
parent 417d9a5bd2
commit 8f5813416d
6 changed files with 3131 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/servergame.h
+5 -5
View File
@@ -125,9 +125,9 @@ public:
void KickPlayer(unsigned playerId);
void AddPlayerToNumJoinsPerPlayer(const std::string &playerName);
int GetNumJoinsPerPlayer(const std::string &playerName);
void ResetNumJoinsPerPlayer();
void AddPlayerToNumJoinsPerPlayer(const std::string &playerName);
int GetNumJoinsPerPlayer(const std::string &playerName);
void ResetNumJoinsPerPlayer();
protected:
@@ -195,7 +195,7 @@ protected:
SessionManager &GetSessionManager();
ServerDBInterface &GetDatabase();
typedef std::map<std::string, int> NumJoinsPerPlayerMap;
typedef std::map<std::string, int> NumJoinsPerPlayerMap;
private:
ServerGame(const ServerGame &other);
@@ -258,7 +258,7 @@ private:
friend class ServerGameStateWaitPlayerAction;
friend class ServerGameStateWaitNextHand;
NumJoinsPerPlayerMap m_numjoinsp;
NumJoinsPerPlayerMap m_numjoinsp;
};
#endif