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

Fixing start cash initialization and rejoin order.

Browse Source
This commit is contained in:
lotodore
2011-12-27 09:35:14 +00:00
parent 4c15195f07
commit 735e554732
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/game.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ Game::Game(GuiInterface* gui, boost::shared_ptr<EngineFactory> factory,
myName = (*player_i)->GetName(); myName = (*player_i)->GetName();
myAvatarFile = (*player_i)->GetAvatarFile(); myAvatarFile = (*player_i)->GetAvatarFile();
myGuid = (*player_i)->GetGuid(); myGuid = (*player_i)->GetGuid();
if ((*player_i)->GetStartCash() > 0) if ((*player_i)->GetStartCash() >= 0)
myStartCash = (*player_i)->GetStartCash(); myStartCash = (*player_i)->GetStartCash();
myStayOnTableStatus = type == PLAYER_TYPE_HUMAN; myStayOnTableStatus = type == PLAYER_TYPE_HUMAN;
++player_i; ++player_i;
src/net/common/servergamestate.cpp
+5 -2
View File
@@ -1130,14 +1130,16 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr<ServerGame> server)
{ {
Game &curGame = server->GetGame(); Game &curGame = server->GetGame();
// Kick inactive players. // Reactivate players which were previously inactive.
ReactivatePlayers(server); ReactivatePlayers(server);
CheckPlayerTimeouts(server);
// Initialize rejoining players. // Initialize rejoining players.
// This has to be done before initialising the new hand, because there are side effects. // This has to be done before initialising the new hand, because there are side effects.
InitRejoiningPlayers(server); InitRejoiningPlayers(server);
// Kick inactive players.
CheckPlayerTimeouts(server);
// Initialize hand. // Initialize hand.
curGame.initHand(); curGame.initHand();
@@ -1357,6 +1359,7 @@ ServerGameStateHand::PerformRejoin(boost::shared_ptr<ServerGame> server, boost::
// Change the Id in the poker engine. // Change the Id in the poker engine.
rejoinPlayer->setMyUniqueID(session->GetPlayerData()->GetUniqueId()); rejoinPlayer->setMyUniqueID(session->GetPlayerData()->GetUniqueId());
rejoinPlayer->setMyGuid(session->GetPlayerData()->GetGuid()); rejoinPlayer->setMyGuid(session->GetPlayerData()->GetGuid());
rejoinPlayer->markRemoteAction();
rejoinPlayer->setIsSessionActive(true); rejoinPlayer->setIsSessionActive(true);
// Send game start notification to rejoining client. // Send game start notification to rejoining client.