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/servergame.cpp
+3 -3
View File
@@ -1169,9 +1169,9 @@ ServerGame::GetNextGameNum()
void void
ServerGame::AddPlayerToNumJoinsPerPlayer(const std::string &playerName) ServerGame::AddPlayerToNumJoinsPerPlayer(const std::string &playerName)
{ {
if(m_numjoinsp.find(playerName) != m_numjoinsp.end()){ if(m_numjoinsp.find(playerName) != m_numjoinsp.end()) {
m_numjoinsp[playerName] = m_numjoinsp[playerName] + 1; m_numjoinsp[playerName] = m_numjoinsp[playerName] + 1;
}else{ } else {
m_numjoinsp[playerName] = 1; m_numjoinsp[playerName] = 1;
} }
} }
@@ -1180,7 +1180,7 @@ int
ServerGame::GetNumJoinsPerPlayer(const std::string &playerName) ServerGame::GetNumJoinsPerPlayer(const std::string &playerName)
{ {
int num = 0; int num = 0;
if(m_numjoinsp.find(playerName) != m_numjoinsp.end()){ if(m_numjoinsp.find(playerName) != m_numjoinsp.end()) {
num = m_numjoinsp[playerName]; num = m_numjoinsp[playerName];
} }
return num; return num;
src/net/common/sessionmanager.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ SessionManager::IsGuestConnectedMultiple(const std::string &clientAddress) const
//if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){ //if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){
// @XXX: debug: // @XXX: debug:
// if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_NORMAL && i->second->GetClientAddr() == clientAddress){ // if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_NORMAL && i->second->GetClientAddr() == clientAddress){
if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){ if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress) {
retVal = true; retVal = true;
break; break;
} }
tests/src/de/pokerth/protocol/ProtoBuf.java
+3084 -1900
View File
File diff suppressed because it is too large Load Diff