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

Adding error handling so that an error within a game does not terminate the server, only the single game.

Browse Source
This commit is contained in:
lotodore
2009-06-19 20:48:57 +00:00
parent 993c2529c3
commit 4c8248353a
2 changed files with 209 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergamestate.cpp
+29 -2
View File
@@ -662,6 +662,20 @@ void
ServerGameStateHand::TimerLoop(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server)
{
if (!ec && &server->GetState() == this)
{
try
{
EngineLoop(server);
}
catch (const PokerTHException &e)
{
server->RemoveAllSessions(); // Close this game on error.
}
}
}
void
ServerGameStateHand::EngineLoop(boost::shared_ptr<ServerGame> server)
{
Game &curGame = server->GetGame();
@@ -864,7 +878,6 @@ ServerGameStateHand::TimerLoop(const boost::system::error_code &ec, boost::share
}
}
}
}
void
ServerGameStateHand::TimerShowCards(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server)
@@ -886,12 +899,19 @@ void
ServerGameStateHand::TimerComputerAction(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server)
{
if (!ec && &server->GetState() == this)
{
try
{
boost::shared_ptr<PlayerInterface> tmpPlayer = server->GetGame().getCurrentPlayer();
tmpPlayer->action();
SendPlayerAction(*server, tmpPlayer);
TimerLoop(ec, server);
EngineLoop(server);
}
catch (const PokerTHException &e)
{
server->RemoveAllSessions(); // Close this game on error.
}
}
}
@@ -1174,6 +1194,8 @@ void
ServerGameStateWaitPlayerAction::TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server)
{
if (!ec && &server->GetState() == this)
{
try
{
Game &curGame = server->GetGame();
// Retrieve current player.
@@ -1189,6 +1211,11 @@ ServerGameStateWaitPlayerAction::TimerTimeout(const boost::system::error_code &e
server->SetState(ServerGameStateHand::Instance());
}
catch (const PokerTHException &e)
{
server->RemoveAllSessions(); // Close this game on error.
}
}
}
//-----------------------------------------------------------------------------
src/net/servergamestate.h
+1
View File
@@ -140,6 +140,7 @@ protected:
virtual int InternalProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet);
void TimerLoop(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void EngineLoop(boost::shared_ptr<ServerGame> server);
void TimerShowCards(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerComputerAction(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerNextHand(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);