Revert ProtoBuf to version 2.6.1 and running astyle

src/net/common/servergame.cpp

@@ -457,8 +457,8 @@ ServerGame::InternalEndGame()
 {
 	StoreAndResetRanking();
 	m_game.reset();
-  // @XXX: reset NumJoinsPerPlayerMap (if a game restarts, the number of joins will be set to 0 for each player)
-  ResetNumJoinsPerPlayer();
+	// @XXX: reset NumJoinsPerPlayerMap (if a game restarts, the number of joins will be set to 0 for each player)
+	ResetNumJoinsPerPlayer();
 }
 
 void
@@ -1169,21 +1169,21 @@ ServerGame::GetNextGameNum()
 void
 ServerGame::AddPlayerToNumJoinsPerPlayer(const std::string &playerName)
 {
-  if(m_numjoinsp.find(playerName) != m_numjoinsp.end()){
-    m_numjoinsp[playerName] = m_numjoinsp[playerName] + 1;
-  }else{
-    m_numjoinsp[playerName] = 1;
-  }
+	if(m_numjoinsp.find(playerName) != m_numjoinsp.end()) {
+		m_numjoinsp[playerName] = m_numjoinsp[playerName] + 1;
+	} else {
+		m_numjoinsp[playerName] = 1;
+	}
 }
 
 int
 ServerGame::GetNumJoinsPerPlayer(const std::string &playerName)
 {
-  int num = 0;
-  if(m_numjoinsp.find(playerName) != m_numjoinsp.end()){
-    num = m_numjoinsp[playerName];
-  }
-  return num;
+	int num = 0;
+	if(m_numjoinsp.find(playerName) != m_numjoinsp.end()) {
+		num = m_numjoinsp[playerName];
+	}
+	return num;
 }
 
 void
@@ -1193,7 +1193,7 @@ ServerGame::ResetNumJoinsPerPlayer()
 	NumJoinsPerPlayerMap::const_iterator numj_end = m_numjoinsp.end();
 
 	while (numj_i != numj_end) {
-    m_numjoinsp[numj_i->first] = 0;
+		m_numjoinsp[numj_i->first] = 0;
 		++numj_i;
 	}
 }

src/net/common/servergamestate.cpp

@@ -540,23 +540,23 @@ ServerGameStateInit::HandleNewPlayer(boost::shared_ptr<ServerGame> server, boost
 	if (session && session->GetPlayerData()) {
 		const GameData &tmpGameData = server->GetGameData();
 
-    // @XXX: debug
-    //LOG_ERROR("New Player: " << session->GetPlayerData()->GetName() << ".");
-    //server->AddPlayerToNumJoinsPerPlayer(session->GetPlayerData()->GetName());
-    //LOG_ERROR("Num joins of " << session->GetPlayerData()->GetName() << " = " << server->GetNumJoinsPerPlayer(session->GetPlayerData()->GetName()) << ".");
+		// @XXX: debug
+		//LOG_ERROR("New Player: " << session->GetPlayerData()->GetName() << ".");
+		//server->AddPlayerToNumJoinsPerPlayer(session->GetPlayerData()->GetName());
+		//LOG_ERROR("Num joins of " << session->GetPlayerData()->GetName() << " = " << server->GetNumJoinsPerPlayer(session->GetPlayerData()->GetName()) << ".");
 
-    // @XXX: check if player joined the game more than 9 times - decline if > 9
-    if (server->GetNumJoinsPerPlayer(session->GetPlayerData()->GetName()) > GAME_NUM_JOINS_PER_PLAYER) {
+		// @XXX: check if player joined the game more than 9 times - decline if > 9
+		if (server->GetNumJoinsPerPlayer(session->GetPlayerData()->GetName()) > GAME_NUM_JOINS_PER_PLAYER) {
 			server->MoveSessionToLobby(session, NTF_NET_REMOVED_GAME_FULL);
-      return;
+			return;
 		}
 
 		// Check the number of players.
 		if (server->GetCurNumberOfPlayers() >= tmpGameData.maxNumberOfPlayers) {
 			server->MoveSessionToLobby(session, NTF_NET_REMOVED_GAME_FULL);
 		} else {
-      // @XXX: add player to NumJoinsPerPlayerMap
-      server->AddPlayerToNumJoinsPerPlayer(session->GetPlayerData()->GetName());
+			// @XXX: add player to NumJoinsPerPlayerMap
+			server->AddPlayerToNumJoinsPerPlayer(session->GetPlayerData()->GetName());
 
 			AcceptNewSession(server, session, false);
 

src/net/common/sessionmanager.cpp

@@ -258,14 +258,14 @@ SessionManager::IsGuestConnectedMultiple(const std::string &clientAddress) const
 
 	while (i != end) {
 		boost::shared_ptr<PlayerData> tmpPlayer(i->second->GetPlayerData());
-    // @XXX: productive:
-    //if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){
-    // @XXX: debug:
-    // if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_NORMAL && i->second->GetClientAddr() == clientAddress){
-    if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){
-      retVal = true;
-      break;
-    }
+		// @XXX: productive:
+		//if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){
+		// @XXX: debug:
+		// if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_NORMAL && i->second->GetClientAddr() == clientAddress){
+		if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress) {
+			retVal = true;
+			break;
+		}
 		++i;
 	}
 	return retVal;

src/net/servergame.h

@@ -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

src/net/sessionmanager.h

@@ -64,7 +64,7 @@ public:
 	bool IsPlayerConnected(const std::string &playerName) const;
 	bool IsPlayerConnected(unsigned uniqueId) const;
 	bool IsClientAddressConnected(const std::string &clientAddress) const;
-  bool IsGuestConnectedMultiple(const std::string &clientAddress) const;
+	bool IsGuestConnectedMultiple(const std::string &clientAddress) const;
 
 	void ForEach(boost::function<void (boost::shared_ptr<SessionData>)> func);