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

last bugfixes for sqlite-log; activating sqlite-log for release version 0.9.1

Browse Source
This commit is contained in:
floty
2012-01-09 12:42:04 +00:00
parent ac3cd7b0c2
commit 5769423595
6 changed files with 25 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
+14 -15
View File
@@ -752,10 +752,9 @@ ClientThread::SetNewGameAdmin(unsigned id)
if (playerData.get()) {
playerData->SetGameAdmin(true);
GetCallback().SignalNetClientNewGameAdmin(id, playerData->GetName());
m_clientLog->logPlayerAction(
playerData->GetName(),
LOG_ACTION_ADMIN
);
if(m_game) {
m_clientLog->logPlayerAction(playerData->GetName(),LOG_ACTION_ADMIN);
}
}
}
@@ -1092,8 +1091,12 @@ ClientThread::AddPlayerData(boost::shared_ptr<PlayerData> playerData)
m_playerDataList.push_back(playerData);
if (playerData->GetUniqueId() == GetGuiPlayerId())
GetCallback().SignalNetClientSelfJoined(playerData->GetUniqueId(), playerData->GetName(), playerData->IsGameAdmin());
else
else {
GetCallback().SignalNetClientPlayerJoined(playerData->GetUniqueId(), playerData->GetName(), playerData->IsGameAdmin());
// if(m_game) {
// m_clientLog->logPlayerAction(playerData->GetName(),LOG_ACTION_JOIN);
// }
}
}
}
@@ -1123,16 +1126,12 @@ ClientThread::RemovePlayerData(unsigned playerId, int removeReason)
}
GetCallback().SignalNetClientPlayerLeft(tmpData->GetUniqueId(), tmpData->GetName(), removeReason);
if(removeReason == NTF_NET_REMOVED_KICKED) {
m_clientLog->logPlayerAction(
tmpData->GetName(),
LOG_ACTION_KICKED
);
} else {
m_clientLog->logPlayerAction(
tmpData->GetName(),
LOG_ACTION_LEFT
);
if(m_game) {
if(removeReason == NTF_NET_REMOVED_KICKED) {
m_clientLog->logPlayerAction(tmpData->GetName(),LOG_ACTION_KICKED);
} else {
m_clientLog->logPlayerAction(tmpData->GetName(),LOG_ACTION_LEFT);
}
}
}
src/net/common/serverlobbythread.cpp
+1 -1
View File
@@ -891,7 +891,7 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr<SessionData> session, boost::s
else if (packet->GetMsg()->present == PokerTHMessage_PR_avatarRequestMessage)
HandleNetPacketRetrieveAvatar(session, packet->GetMsg()->choice.avatarRequestMessage);
else if (packet->GetMsg()->present == PokerTHMessage_PR_resetTimeoutMessage)
{}
{}
else if (packet->GetMsg()->present == PokerTHMessage_PR_subscriptionRequestMessage) {
SubscriptionRequestMessage_t *subscriptionRequest = &packet->GetMsg()->choice.subscriptionRequestMessage;
if (subscriptionRequest->subscriptionAction == subscriptionAction_resubscribeGameList)