Revert ProtoBuf to version 2.6.1 and running astyle

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
+8 -8
View File
@@ -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;