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

Send minimum raise value on players action done, not players turn. This version is NOT compatible to the current internet server.

Browse Source
This commit is contained in:
lotodore
2007-11-18 00:06:14 +00:00
parent b8b9cac9da
commit 88c55eb68a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+1 -1
View File
@@ -946,6 +946,7 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptr<NetP
tmpPlayer->setMySetAbsolute(actionDoneData.totalPlayerBet);
tmpPlayer->setMyCash(actionDoneData.playerMoney);
curGame->getCurrentHand()->getCurrentBeRo()->setHighestSet(actionDoneData.highestSet);
curGame->getCurrentHand()->getCurrentBeRo()->setMinimumRaise(actionDoneData.minimumRaise);
curGame->getCurrentHand()->getBoard()->collectSets();
curGame->getCurrentHand()->switchRounds();
@@ -991,7 +992,6 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptr<NetP
// Next player's turn.
curGame->getCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId(tmpPlayer->getMyID());
curGame->getCurrentHand()->getCurrentBeRo()->setMinimumRaise(turnData.minimumRaise);
curGame->getCurrentHand()->getCurrentBeRo()->setPlayersTurn(tmpPlayer->getMyID());
// Mark current player in GUI.
src/net/common/netpacket.cpp
+3 -3
View File
@@ -367,7 +367,6 @@ struct GCC_PACKED NetPacketPlayersTurnData
{
NetPacketHeader head;
u_int32_t playerId;
u_int32_t minimumRaise;
u_int16_t gameState;
u_int16_t reserved;
};
@@ -389,6 +388,7 @@ struct GCC_PACKED NetPacketPlayersActionDoneData
u_int32_t totalPlayerBet;
u_int32_t playerMoney;
u_int32_t highestSet;
u_int32_t minimumRaise;
};
struct GCC_PACKED NetPacketPlayersActionRejectedData
@@ -3264,7 +3264,6 @@ NetPacketPlayersTurn::SetData(const NetPacketPlayersTurn::Data &inData)
tmpData->playerId = htonl(inData.playerId);
tmpData->gameState = htons(inData.gameState);
tmpData->minimumRaise = htonl(inData.minimumRaise);
// Check the packet - just in case.
Check(GetRawData());
@@ -3277,7 +3276,6 @@ NetPacketPlayersTurn::GetData(NetPacketPlayersTurn::Data &outData) const
outData.playerId = ntohl(tmpData->playerId);
outData.gameState = static_cast<GameState>(ntohs(tmpData->gameState));
outData.minimumRaise = ntohl(tmpData->minimumRaise);
}
const NetPacketPlayersTurn *
@@ -3404,6 +3402,7 @@ NetPacketPlayersActionDone::SetData(const NetPacketPlayersActionDone::Data &inDa
tmpData->totalPlayerBet = htonl(inData.totalPlayerBet);
tmpData->playerMoney = htonl(inData.playerMoney);
tmpData->highestSet = htonl(inData.highestSet);
tmpData->minimumRaise = htonl(inData.minimumRaise);
// Check the packet - just in case.
Check(GetRawData());
@@ -3420,6 +3419,7 @@ NetPacketPlayersActionDone::GetData(NetPacketPlayersActionDone::Data &outData) c
outData.totalPlayerBet = ntohl(tmpData->totalPlayerBet);
outData.playerMoney = ntohl(tmpData->playerMoney);
outData.highestSet = ntohl(tmpData->highestSet);
outData.minimumRaise = ntohl(tmpData->minimumRaise);
}
const NetPacketPlayersActionDone *
src/net/common/servergamestate.cpp
+1 -1
View File
@@ -77,6 +77,7 @@ static void SendPlayerAction(ServerGameThread &server, boost::shared_ptr<PlayerI
actionDoneData.totalPlayerBet = player->getMySet();
actionDoneData.playerMoney = player->getMyCash();
actionDoneData.highestSet = server.GetGame().getCurrentHand()->getCurrentBeRo()->getHighestSet();
actionDoneData.minimumRaise = server.GetGame().getCurrentHand()->getCurrentBeRo()->getMinimumRaise();
static_cast<NetPacketPlayersActionDone *>(notifyActionDone.get())->SetData(actionDoneData);
server.SendToAllPlayers(notifyActionDone, SessionData::Game);
}
@@ -710,7 +711,6 @@ ServerGameStateStartRound::Process(ServerGameThread &server)
NetPacketPlayersTurn::Data playersTurnData;
playersTurnData.gameState = (GameState)curGame.getCurrentHand()->getCurrentRound();
playersTurnData.playerId = curPlayer->getMyUniqueID();
playersTurnData.minimumRaise = curGame.getCurrentHand()->getCurrentBeRo()->getMinimumRaise();
static_cast<NetPacketPlayersTurn *>(notification.get())->SetData(playersTurnData);
server.SendToAllPlayers(notification, SessionData::Game);
src/net/netpacket.h
+1 -1
View File
@@ -842,7 +842,6 @@ public:
{
GameState gameState;
u_int32_t playerId;
u_int32_t minimumRaise;
};
NetPacketPlayersTurn();
@@ -896,6 +895,7 @@ public:
u_int32_t totalPlayerBet;
u_int32_t playerMoney;
u_int32_t highestSet;
u_int32_t minimumRaise;
};
NetPacketPlayersActionDone();