From d4b82d7dbc5287ea5d83ea22f8a019dd89d38746 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 27 Mar 2010 12:50:05 +0000 Subject: [PATCH] Fixing game admin stuff. --- src/net/clientcallback.h | 5 ++--- src/net/common/clientthread.cpp | 4 ++-- src/net/common/servergame.cpp | 2 +- src/net/common/servergamestate.cpp | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/net/clientcallback.h b/src/net/clientcallback.h index 4abcc50d..985e0508 100644 --- a/src/net/clientcallback.h +++ b/src/net/clientcallback.h @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -51,8 +50,8 @@ public: virtual void SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId) = 0; virtual void SignalNetClientGameStart(boost::shared_ptr game) = 0; - virtual void SignalNetClientSelfJoined(unsigned playerId, const std::string &playerName, PlayerRights rights) = 0; - virtual void SignalNetClientPlayerJoined(unsigned playerId, const std::string &playerName, PlayerRights rights) = 0; + virtual void SignalNetClientSelfJoined(unsigned playerId, const std::string &playerName, bool isGameAdmin) = 0; + virtual void SignalNetClientPlayerJoined(unsigned playerId, const std::string &playerName, bool isGameAdmin) = 0; virtual void SignalNetClientPlayerChanged(unsigned playerId, const std::string &newPlayerName) = 0; virtual void SignalNetClientPlayerLeft(unsigned playerId, const std::string &playerName, int removeReason) = 0; virtual void SignalNetClientNewGameAdmin(unsigned playerId, const std::string &playerName) = 0; diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index f55659d9..60e4247c 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -994,9 +994,9 @@ ClientThread::AddPlayerData(boost::shared_ptr playerData) { m_playerDataList.push_back(playerData); if (playerData->GetUniqueId() == GetGuiPlayerId()) - GetCallback().SignalNetClientSelfJoined(playerData->GetUniqueId(), playerData->GetName(), playerData->GetRights()); + GetCallback().SignalNetClientSelfJoined(playerData->GetUniqueId(), playerData->GetName(), playerData->IsGameAdmin()); else - GetCallback().SignalNetClientPlayerJoined(playerData->GetUniqueId(), playerData->GetName(), playerData->GetRights()); + GetCallback().SignalNetClientPlayerJoined(playerData->GetUniqueId(), playerData->GetName(), playerData->IsGameAdmin()); } } diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index 974effeb..8edc30fc 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -566,7 +566,7 @@ ServerGame::GracefulRemoveSession(SessionWrapper session, int reason) void ServerGame::RemovePlayerData(boost::shared_ptr player, int reason) { - if (player->GetRights() == PLAYER_RIGHTS_ADMIN) + if (player->IsGameAdmin()) { // Find new admin for the game PlayerDataList playerList(GetSessionManager().GetPlayerDataList()); diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index e7768be5..52eefb8e 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -206,7 +206,7 @@ AbstractServerGameStateReceiving::ProcessPacket(boost::shared_ptr se // Only admins are allowed to kick, and only in the lobby. // After leaving the lobby, a vote needs to be initiated to kick. KickPlayerRequestMessage_t *netKickRequest = &packet->GetMsg()->choice.kickPlayerRequestMessage; - if (session.playerData->GetRights() == PLAYER_RIGHTS_ADMIN && !server->IsRunning() && netKickRequest->gameId == server->GetId()) + if (session.playerData->IsGameAdmin() && !server->IsRunning() && netKickRequest->gameId == server->GetId()) { server->InternalKickPlayer(netKickRequest->playerId); } @@ -430,7 +430,7 @@ ServerGameStateInit::InternalProcessPacket(boost::shared_ptr server, { StartEventMessage_t *netStartEvent = &packet->GetMsg()->choice.startEventMessage; // Only admins are allowed to start the game. - if (session.playerData->GetRights() == PLAYER_RIGHTS_ADMIN && netStartEvent->gameId == server->GetId()) + if (session.playerData->IsGameAdmin() && netStartEvent->gameId == server->GetId()) { // Fill up with computer players. server->ResetComputerPlayerList(); @@ -463,7 +463,7 @@ ServerGameStateInit::InternalProcessPacket(boost::shared_ptr server, } else if (packet->GetMsg()->present == PokerTHMessage_PR_resetTimeoutMessage) { - if (session.playerData->GetRights() == PLAYER_RIGHTS_ADMIN) + if (session.playerData->IsGameAdmin()) { RegisterAdminTimer(server); }