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

Running astyle.

Browse Source
This commit is contained in:
lotodore
2012-12-21 01:01:01 +01:00
parent 7503b1754e
commit d3cd97c666
63 changed files with 4437 additions and 4448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+20 -21
View File
@@ -560,24 +560,24 @@ AbstractClientStateReceiving::HandlePacket(boost::shared_ptr<ClientThread> clien
client->GetCallback().SignalNetClientWaitDialog();
int removeReason;
switch (netRemoved.removedfromgamereason()) {
case RemovedFromGameMessage::kickedFromGame :
removeReason = NTF_NET_REMOVED_KICKED;
break;
case RemovedFromGameMessage::gameIsFull :
removeReason = NTF_NET_REMOVED_GAME_FULL;
break;
case RemovedFromGameMessage::gameIsRunning :
removeReason = NTF_NET_REMOVED_ALREADY_RUNNING;
break;
case RemovedFromGameMessage::gameTimeout :
removeReason = NTF_NET_REMOVED_TIMEOUT;
break;
case RemovedFromGameMessage::removedStartFailed :
removeReason = NTF_NET_REMOVED_START_FAILED;
break;
default :
removeReason = NTF_NET_REMOVED_ON_REQUEST;
break;
case RemovedFromGameMessage::kickedFromGame :
removeReason = NTF_NET_REMOVED_KICKED;
break;
case RemovedFromGameMessage::gameIsFull :
removeReason = NTF_NET_REMOVED_GAME_FULL;
break;
case RemovedFromGameMessage::gameIsRunning :
removeReason = NTF_NET_REMOVED_ALREADY_RUNNING;
break;
case RemovedFromGameMessage::gameTimeout :
removeReason = NTF_NET_REMOVED_TIMEOUT;
break;
case RemovedFromGameMessage::removedStartFailed :
removeReason = NTF_NET_REMOVED_START_FAILED;
break;
default :
removeReason = NTF_NET_REMOVED_ON_REQUEST;
break;
}
client->GetCallback().SignalNetClientRemovedFromGame(removeReason);
client->SetState(ClientStateWaitJoin::Instance());
@@ -1177,7 +1177,7 @@ ClientStateWaitJoin::InternalHandlePacket(boost::shared_ptr<ClientThread> client
// Player number is 0 on init. Will be set when the game starts.
boost::shared_ptr<PlayerData> playerData(
new PlayerData(client->GetGuiPlayerId(), 0, PLAYER_TYPE_HUMAN,
context.GetPlayerRights(), netJoinAck.areyougameadmin()));
context.GetPlayerRights(), netJoinAck.areyougameadmin()));
playerData->SetName(context.GetPlayerName());
playerData->SetAvatarFile(context.GetAvatarFile());
client->AddPlayerData(playerData);
@@ -1393,8 +1393,7 @@ void
ClientStateWaitStart::InternalHandlePacket(boost::shared_ptr<ClientThread> client, boost::shared_ptr<NetPacket> tmpPacket)
{
if (tmpPacket->GetMsg()->messagetype() == PokerTHMessage::Type_GameStartInitialMessage
|| tmpPacket->GetMsg()->messagetype() == PokerTHMessage::Type_GameStartRejoinMessage)
{
|| tmpPacket->GetMsg()->messagetype() == PokerTHMessage::Type_GameStartRejoinMessage) {
PlayerIdList tmpPlayerList;
unsigned tmpHandId = 0;
src/net/common/receivebuffer.cpp
+1 -2
View File
@@ -85,8 +85,7 @@ ReceiveBuffer::ScanPackets()
uint32_t nativeVal;
memcpy(&nativeVal, &recvBuf[0], sizeof(uint32_t));
size_t packetSize = ntohl(nativeVal);
if (recvBufUsed >= packetSize + NET_HEADER_SIZE)
{
if (recvBufUsed >= packetSize + NET_HEADER_SIZE) {
try {
tmpPacket = NetPacket::Create(&recvBuf[NET_HEADER_SIZE], packetSize);
if (tmpPacket) {
src/net/common/servergame.cpp
+6 -6
View File
@@ -549,12 +549,12 @@ ServerGame::InternalDenyVoteKick(boost::shared_ptr<SessionData> byWhom, unsigned
netVoteReply->set_gameid(GetId());
netVoteReply->set_petitionid(petitionId);
switch(reason) {
case VOTE_DENIED_ALREADY_VOTED :
netVoteReply->set_votekickreplytype(VoteKickReplyMessage::voteKickDeniedAlreadyVoted);
break;
default:
netVoteReply->set_votekickreplytype(VoteKickReplyMessage::voteKickDeniedInvalid);
break;
case VOTE_DENIED_ALREADY_VOTED :
netVoteReply->set_votekickreplytype(VoteKickReplyMessage::voteKickDeniedAlreadyVoted);
break;
default:
netVoteReply->set_votekickreplytype(VoteKickReplyMessage::voteKickDeniedInvalid);
break;
}
GetLobbyThread().GetSender().Send(byWhom, packet);
}
src/net/common/serverlobbythread.cpp
+1 -1
View File
@@ -904,7 +904,7 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr<SessionData> session, boost::s
} else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_JoinExistingGameMessage) {
HandleNetPacketJoinGame(session, packet->GetMsg()->joinexistinggamemessage());
} else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_RejoinExistingGameMessage) {
HandleNetPacketRejoinGame(session, packet->GetMsg()->rejoinexistinggamemessage());
HandleNetPacketRejoinGame(session, packet->GetMsg()->rejoinexistinggamemessage());
} else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ChatRequestMessage) {
HandleNetPacketChatRequest(session, packet->GetMsg()->chatrequestmessage());
} else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_RejectGameInvitationMessage) {
src/net/common/uploadhelper.cpp
+3 -3
View File
@@ -74,9 +74,9 @@ UploadHelper::InternalInit(const string &/*url*/, const string &targetFileName,
// Curl will handle file I/O.
struct curl_httppost *last = NULL;
curl_formadd(&GetData()->post, &last,
CURLFORM_COPYNAME, httpPost.c_str(),
CURLFORM_FILE, targetFileName.c_str(),
CURLFORM_END);
CURLFORM_COPYNAME, httpPost.c_str(),
CURLFORM_FILE, targetFileName.c_str(),
CURLFORM_END);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_HTTPPOST, GetData()->post);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_WRITEFUNCTION, writeFunction);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_WRITEDATA, &GetData()->returnMessage);