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/common/servergamestate.cpp
+9 -9
View File
@@ -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);