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

Use one timer less per game (optimisation).

Browse Source
This commit is contained in:
lotodore
2010-10-19 13:13:39 +00:00
parent 3575fc3baf
commit 045218c2e3
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergame.cpp
+8 -7
View File
@@ -68,12 +68,6 @@ void
ServerGame::Init() ServerGame::Init()
{ {
m_doNotAutoKickSmallDelaySec = m_playerConfig->readConfigInt("ServerDoNotAutoKickSmallDelaySec"); m_doNotAutoKickSmallDelaySec = m_playerConfig->readConfigInt("ServerDoNotAutoKickSmallDelaySec");
m_voteKickTimer.expires_from_now(
boost::posix_time::milliseconds(SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC));
m_voteKickTimer.async_wait(
boost::bind(
&ServerGame::TimerVoteKick, shared_from_this(), boost::asio::placeholders::error));
SetState(SERVER_INITIAL_STATE::Instance()); SetState(SERVER_INITIAL_STATE::Instance());
} }
@@ -228,13 +222,13 @@ ServerGame::TimerVoteKick(const boost::system::error_code &ec)
// This petition has ended. // This petition has ended.
m_voteKickData.reset(); m_voteKickData.reset();
} }
}
m_voteKickTimer.expires_from_now( m_voteKickTimer.expires_from_now(
boost::posix_time::milliseconds(SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC)); boost::posix_time::milliseconds(SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC));
m_voteKickTimer.async_wait( m_voteKickTimer.async_wait(
boost::bind( boost::bind(
&ServerGame::TimerVoteKick, shared_from_this(), boost::asio::placeholders::error)); &ServerGame::TimerVoteKick, shared_from_this(), boost::asio::placeholders::error));
} }
}
} }
void void
@@ -437,6 +431,13 @@ ServerGame::InternalAskVoteKick(SessionWrapper byWhom, unsigned playerIdWho, uns
netStartPetition->kickTimeoutSec = timeoutSec; netStartPetition->kickTimeoutSec = timeoutSec;
netStartPetition->numVotesNeededToKick = m_voteKickData->numVotesToKick; netStartPetition->numVotesNeededToKick = m_voteKickData->numVotesToKick;
SendToAllPlayers(packet, SessionData::Game); SendToAllPlayers(packet, SessionData::Game);
m_voteKickTimer.expires_from_now(
boost::posix_time::milliseconds(SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC));
m_voteKickTimer.async_wait(
boost::bind(
&ServerGame::TimerVoteKick, shared_from_this(), boost::asio::placeholders::error));
} }
else else
InternalDenyAskVoteKick(byWhom, playerIdWho, KICK_DENIED_OTHER_IN_PROGRESS); InternalDenyAskVoteKick(byWhom, playerIdWho, KICK_DENIED_OTHER_IN_PROGRESS);