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

Rejoin now works, but yet only as spectator.

Browse Source
This commit is contained in:
lotodore
2011-10-03 09:53:50 +00:00
parent 7bda27d793
commit 828fc6bfac
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergamestate.cpp
+5 -2
View File
@@ -1133,9 +1133,8 @@ ServerGameStateHand::GetDealCardsDelaySec(ServerGame &server)
void
ServerGameStateHand::StartNewHand(boost::shared_ptr<ServerGame> server)
{
// Initialize hand.
Game &curGame = server->GetGame();
curGame.initHand();
// Initialize rejoining players.
{
PlayerIdList rejoinIdList(server->GetAndResetRejoinPlayers());
@@ -1158,6 +1157,7 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr<ServerGame> server)
GameStartModeRejoin_t *netStartModeRejoin = &netGameStart->gameStartMode.choice.gameStartModeRejoin;
// Send player data to client.
netStartModeRejoin->handNum = curGame.getCurrentHandID();
PlayerListIterator player_i = curGame.getSeatsList()->begin();
PlayerListIterator player_end = curGame.getSeatsList()->end();
while (player_i != player_end) {
@@ -1178,6 +1178,9 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr<ServerGame> server)
}
}
// Initialize hand.
curGame.initHand();
// HACK: Skip GUI notification run
curGame.getCurrentHand()->getFlop()->skipFirstRunGui();
curGame.getCurrentHand()->getTurn()->skipFirstRunGui();