sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly converting remove reason on client side (#94).

Browse Source
This commit is contained in:
lotodore
2012-01-08 08:33:06 +00:00
parent 39ee950758
commit 1379babe38
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+11 -2
View File
@@ -682,7 +682,16 @@ AbstractClientStateReceiving::HandlePacket(boost::shared_ptr<ClientThread> clien
} }
} }
// Signal to GUI and remove from data list. // Signal to GUI and remove from data list.
client->RemovePlayerData(netLeft->playerId, netLeft->gamePlayerLeftReason); int removeReason;
switch (netLeft->gamePlayerLeftReason) {
case gamePlayerLeftReason_leftKicked :
removeReason = NTF_NET_REMOVED_KICKED;
break;
default :
removeReason = NTF_NET_REMOVED_ON_REQUEST;
break;
}
client->RemovePlayerData(netLeft->playerId, removeReason);
} else if (netGamePlayer->gamePlayerNotification.present == gamePlayerNotification_PR_gameAdminChanged) { } else if (netGamePlayer->gamePlayerNotification.present == gamePlayerNotification_PR_gameAdminChanged) {
// New admin for the game. // New admin for the game.
GameAdminChanged_t *netChanged = &netGamePlayer->gamePlayerNotification.choice.gameAdminChanged; GameAdminChanged_t *netChanged = &netGamePlayer->gamePlayerNotification.choice.gameAdminChanged;
@@ -1558,7 +1567,7 @@ ClientStateWaitStart::InternalHandlePacket(boost::shared_ptr<ClientThread> clien
client->GetGame()->setCurrentHandID(tmpHandId); client->GetGame()->setCurrentHandID(tmpHandId);
// We need to remove the temporary player data objects after creating the game. // We need to remove the temporary player data objects after creating the game.
BOOST_FOREACH(unsigned tmpPlayerId, tmpPlayerList) { BOOST_FOREACH(unsigned tmpPlayerId, tmpPlayerList) {
client->RemovePlayerData(tmpPlayerId, gamePlayerLeftReason_leftOnRequest); client->RemovePlayerData(tmpPlayerId, NTF_NET_REMOVED_ON_REQUEST);
} }
client->GetCallback().SignalNetClientGameInfo(MSG_NET_GAME_CLIENT_START); client->GetCallback().SignalNetClientGameInfo(MSG_NET_GAME_CLIENT_START);
client->SetState(ClientStateWaitHand::Instance()); client->SetState(ClientStateWaitHand::Instance());