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

Reformatting code using Kernighan & Ritchie style, tabs, tab width=4.

Browse Source 
Command line: astyle --style=kr --indent=force-tab=4 --lineend=linux -n -r <file names>
This commit is contained in:
lotodore
2011-02-11 20:02:08 +00:00
parent 29dca1846e
commit 02518c67b2
232 changed files with 22743 additions and 21044 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/netpacket.cpp
+112 -128
View File
@@ -23,7 +23,7 @@
using namespace std;
NetPacket::NetPacket(MemAllocType alloc)
: m_msg(NULL)
: m_msg(NULL)
{
if (alloc != NoAlloc)
m_msg = (PokerTHMessage_t *)calloc(1, sizeof(PokerTHMessage_t));
@@ -40,26 +40,20 @@ NetPacket::Create(char *data, unsigned &dataSize)
boost::shared_ptr<NetPacket> tmpPacket;
// Check minimum requirements.
if (data && dataSize > 0)
{
if (data && dataSize > 0) {
PokerTHMessage_t *msg = NULL;
asn_dec_rval_t retVal = ber_decode(0, &asn_DEF_PokerTHMessage, (void **)&msg, data, dataSize);
if(retVal.code == RC_OK)
{
if(retVal.code == RC_OK) {
// ASN.1 BER decoding was successful.
tmpPacket.reset(new NetPacket(NoAlloc));
tmpPacket->m_msg = msg;
// Consume the bytes.
if (retVal.consumed < dataSize)
{
if (retVal.consumed < dataSize) {
dataSize -= retVal.consumed;
memmove(data, data + retVal.consumed, dataSize);
}
else
} else
dataSize = 0;
}
else
{
} else {
// Free the partially decoded message (if applicable).
ASN_STRUCT_FREE(asn_DEF_PokerTHMessage, msg);
}
@@ -72,15 +66,14 @@ NetPacket::IsClientActivity() const
{
bool retVal = false;
if (m_msg &&
(m_msg->present == PokerTHMessage_PR_initMessage
|| m_msg->present == PokerTHMessage_PR_joinGameRequestMessage
|| m_msg->present == PokerTHMessage_PR_kickPlayerRequestMessage
|| m_msg->present == PokerTHMessage_PR_leaveGameRequestMessage
|| m_msg->present == PokerTHMessage_PR_startEventMessage
|| m_msg->present == PokerTHMessage_PR_myActionRequestMessage
|| m_msg->present == PokerTHMessage_PR_resetTimeoutMessage
|| m_msg->present == PokerTHMessage_PR_chatRequestMessage))
{
(m_msg->present == PokerTHMessage_PR_initMessage
|| m_msg->present == PokerTHMessage_PR_joinGameRequestMessage
|| m_msg->present == PokerTHMessage_PR_kickPlayerRequestMessage
|| m_msg->present == PokerTHMessage_PR_leaveGameRequestMessage
|| m_msg->present == PokerTHMessage_PR_startEventMessage
|| m_msg->present == PokerTHMessage_PR_myActionRequestMessage
|| m_msg->present == PokerTHMessage_PR_resetTimeoutMessage
|| m_msg->present == PokerTHMessage_PR_chatRequestMessage)) {
retVal = true;
}
return retVal;
@@ -112,13 +105,10 @@ NetPacket::SetGameData(const GameData &inData, NetGameInfo_t *outData)
outData->netGameType = inData.gameType;
outData->maxNumPlayers = inData.maxNumberOfPlayers;
outData->raiseIntervalMode.present = static_cast<raiseIntervalMode_PR>(inData.raiseIntervalMode);
if (inData.raiseIntervalMode == RAISE_ON_HANDNUMBER)
{
if (inData.raiseIntervalMode == RAISE_ON_HANDNUMBER) {
outData->raiseIntervalMode.present = raiseIntervalMode_PR_raiseEveryHands;
outData->raiseIntervalMode.choice.raiseEveryHands = inData.raiseSmallBlindEveryHandsValue;
}
else
{
} else {
outData->raiseIntervalMode.present = raiseIntervalMode_PR_raiseEveryMinutes;
outData->raiseIntervalMode.choice.raiseEveryMinutes = inData.raiseSmallBlindEveryMinutesValue;
}
@@ -130,12 +120,10 @@ NetPacket::SetGameData(const GameData &inData, NetGameInfo_t *outData)
outData->firstSmallBlind = inData.firstSmallBlind;
outData->startMoney = inData.startMoney;
if (numManualBlinds)
{
if (numManualBlinds) {
list<int>::const_iterator i = inData.manualBlindsList.begin();
list<int>::const_iterator end = inData.manualBlindsList.end();
while (i != end)
{
while (i != end) {
long *manualBlind = (long *)calloc(1, sizeof(long));
*manualBlind = *i;
ASN_SEQUENCE_ADD(&outData->manualBlinds.list, manualBlind);
@@ -168,12 +156,10 @@ NetPacket::GetGameData(const NetGameInfo_t *inData, GameData &outData)
outData.afterMBAlwaysRaiseValue = inData->endRaiseSmallBlindValue;
outData.startMoney = inData->startMoney;
if (numManualBlinds)
{
if (numManualBlinds) {
long **manualBlindsPtr = inData->manualBlinds.list.array;
int counter = 0;
for (int i = 0; i < numManualBlinds; i++)
{
for (int i = 0; i < numManualBlinds; i++) {
outData.manualBlindsList.push_back((int)*manualBlindsPtr[i]);
counter++;
}
@@ -184,53 +170,52 @@ int
NetPacket::NetErrorToGameError(long netErrorReason)
{
int retVal;
switch(netErrorReason)
{
case errorReason_errorInitVersionNotSupported :
retVal = ERR_NET_VERSION_NOT_SUPPORTED;
break;
case errorReason_errorInitServerFull :
retVal = ERR_NET_SERVER_FULL;
break;
case errorReason_errorInitAuthFailure :
retVal = ERR_NET_INVALID_PASSWORD;
break;
case errorReason_errorInitPlayerNameInUse :
retVal = ERR_NET_PLAYER_NAME_IN_USE;
break;
case errorReason_errorInitInvalidPlayerName :
retVal = ERR_NET_INVALID_PLAYER_NAME;
break;
case errorReason_errorInitServerMaintenance :
retVal = ERR_NET_SERVER_MAINTENANCE;
break;
case errorReason_errorInitBlocked :
retVal = ERR_NET_INIT_BLOCKED;
break;
case errorReason_errorAvatarTooLarge :
retVal = ERR_NET_AVATAR_TOO_LARGE;
break;
case errorReason_errorInvalidPacket :
retVal = ERR_SOCK_INVALID_PACKET;
break;
case errorReason_errorInvalidState :
retVal = ERR_SOCK_INVALID_STATE;
break;
case errorReason_errorKickedFromServer :
retVal = ERR_NET_PLAYER_KICKED;
break;
case errorReason_errorBannedFromServer :
retVal = ERR_NET_PLAYER_BANNED;
break;
case errorReason_errorBlockedByServer :
retVal = ERR_NET_PLAYER_BLOCKED;
break;
case errorReason_errorSessionTimeout :
retVal = ERR_NET_SESSION_TIMED_OUT;
break;
default :
retVal = ERR_SOCK_INTERNAL;
break;
switch(netErrorReason) {
case errorReason_errorInitVersionNotSupported :
retVal = ERR_NET_VERSION_NOT_SUPPORTED;
break;
case errorReason_errorInitServerFull :
retVal = ERR_NET_SERVER_FULL;
break;
case errorReason_errorInitAuthFailure :
retVal = ERR_NET_INVALID_PASSWORD;
break;
case errorReason_errorInitPlayerNameInUse :
retVal = ERR_NET_PLAYER_NAME_IN_USE;
break;
case errorReason_errorInitInvalidPlayerName :
retVal = ERR_NET_INVALID_PLAYER_NAME;
break;
case errorReason_errorInitServerMaintenance :
retVal = ERR_NET_SERVER_MAINTENANCE;
break;
case errorReason_errorInitBlocked :
retVal = ERR_NET_INIT_BLOCKED;
break;
case errorReason_errorAvatarTooLarge :
retVal = ERR_NET_AVATAR_TOO_LARGE;
break;
case errorReason_errorInvalidPacket :
retVal = ERR_SOCK_INVALID_PACKET;
break;
case errorReason_errorInvalidState :
retVal = ERR_SOCK_INVALID_STATE;
break;
case errorReason_errorKickedFromServer :
retVal = ERR_NET_PLAYER_KICKED;
break;
case errorReason_errorBannedFromServer :
retVal = ERR_NET_PLAYER_BANNED;
break;
case errorReason_errorBlockedByServer :
retVal = ERR_NET_PLAYER_BLOCKED;
break;
case errorReason_errorSessionTimeout :
retVal = ERR_NET_SESSION_TIMED_OUT;
break;
default :
retVal = ERR_SOCK_INTERNAL;
break;
}
return retVal;
}
@@ -239,53 +224,52 @@ long
NetPacket::GameErrorToNetError(int gameErrorReason)
{
int retVal;
switch(gameErrorReason)
{
case ERR_NET_VERSION_NOT_SUPPORTED :
retVal = errorReason_errorInitVersionNotSupported;
break;
case ERR_NET_SERVER_FULL :
retVal = errorReason_errorInitServerFull;
break;
case ERR_NET_INVALID_PASSWORD :
retVal = errorReason_errorInitAuthFailure;
break;
case ERR_NET_PLAYER_NAME_IN_USE :
retVal = errorReason_errorInitPlayerNameInUse;
break;
case ERR_NET_INVALID_PLAYER_NAME :
retVal = errorReason_errorInitInvalidPlayerName;
break;
case ERR_NET_SERVER_MAINTENANCE :
retVal = errorReason_errorInitServerMaintenance;
break;
case ERR_NET_INIT_BLOCKED :
retVal = errorReason_errorInitBlocked;
break;
case ERR_NET_AVATAR_TOO_LARGE :
retVal = errorReason_errorAvatarTooLarge;
break;
case ERR_SOCK_INVALID_PACKET :
retVal = errorReason_errorInvalidPacket;
break;
case ERR_SOCK_INVALID_STATE :
retVal = errorReason_errorInvalidState;
break;
case ERR_NET_PLAYER_KICKED :
retVal = errorReason_errorKickedFromServer;
break;
case ERR_NET_PLAYER_BLOCKED :
retVal = errorReason_errorBlockedByServer;
break;
case ERR_NET_PLAYER_BANNED :
retVal = errorReason_errorBannedFromServer;
break;
case ERR_NET_SESSION_TIMED_OUT :
retVal = errorReason_errorSessionTimeout;
break;
default :
retVal = errorReason_errorReserved;
break;
switch(gameErrorReason) {
case ERR_NET_VERSION_NOT_SUPPORTED :
retVal = errorReason_errorInitVersionNotSupported;
break;
case ERR_NET_SERVER_FULL :
retVal = errorReason_errorInitServerFull;
break;
case ERR_NET_INVALID_PASSWORD :
retVal = errorReason_errorInitAuthFailure;
break;
case ERR_NET_PLAYER_NAME_IN_USE :
retVal = errorReason_errorInitPlayerNameInUse;
break;
case ERR_NET_INVALID_PLAYER_NAME :
retVal = errorReason_errorInitInvalidPlayerName;
break;
case ERR_NET_SERVER_MAINTENANCE :
retVal = errorReason_errorInitServerMaintenance;
break;
case ERR_NET_INIT_BLOCKED :
retVal = errorReason_errorInitBlocked;
break;
case ERR_NET_AVATAR_TOO_LARGE :
retVal = errorReason_errorAvatarTooLarge;
break;
case ERR_SOCK_INVALID_PACKET :
retVal = errorReason_errorInvalidPacket;
break;
case ERR_SOCK_INVALID_STATE :
retVal = errorReason_errorInvalidState;
break;
case ERR_NET_PLAYER_KICKED :
retVal = errorReason_errorKickedFromServer;
break;
case ERR_NET_PLAYER_BLOCKED :
retVal = errorReason_errorBlockedByServer;
break;
case ERR_NET_PLAYER_BANNED :
retVal = errorReason_errorBannedFromServer;
break;
case ERR_NET_SESSION_TIMED_OUT :
retVal = errorReason_errorSessionTimeout;
break;
default :
retVal = errorReason_errorReserved;
break;
}
return retVal;
}