From cfdc52a8d5de43665646add5f35efc3697cf028a Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 7 Jun 2007 07:55:18 +0000 Subject: [PATCH] net timer changes --- src/net/common/serverrecvstate.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net/common/serverrecvstate.cpp b/src/net/common/serverrecvstate.cpp index b5876249..05e49cef 100644 --- a/src/net/common/serverrecvstate.cpp +++ b/src/net/common/serverrecvstate.cpp @@ -34,7 +34,7 @@ using namespace std; #define SERVER_WAIT_TIMEOUT_MSEC 50 #define SERVER_NEXT_HAND_DELAY_SEC 10 -#define SERVER_DEAL_FLOP_CARDS_SEC 6 +#define SERVER_DEAL_FLOP_CARDS_SEC 5 #define SERVER_DEAL_TURN_CARD_SEC 3 #define SERVER_DEAL_RIVER_CARD_SEC 3 @@ -857,20 +857,20 @@ ServerRecvStateDealCardsDelay::Process(ServerRecvThread &server) Game &curGame = server.GetGame(); - int allInDelay = curGame.getCurrentHand()->getAllInCondition() ? 2 : 0; + int allInDelay = curGame.getCurrentHand()->getAllInCondition() ? 1 : 0; switch(curGame.getCurrentHand()->getActualRound()) { case GAME_STATE_FLOP: - if (m_delayTimer.elapsed().seconds() >= SERVER_DEAL_FLOP_CARDS_SEC + allInDelay) + if (m_delayTimer.elapsed().seconds() >= SERVER_DEAL_FLOP_CARDS_SEC - allInDelay) server.SetState(ServerRecvStateStartRound::Instance()); break; case GAME_STATE_TURN: - if (m_delayTimer.elapsed().seconds() >= SERVER_DEAL_TURN_CARD_SEC + allInDelay) + if (m_delayTimer.elapsed().seconds() >= SERVER_DEAL_TURN_CARD_SEC /*+ allInDelay*/) server.SetState(ServerRecvStateStartRound::Instance()); break; case GAME_STATE_RIVER: - if (m_delayTimer.elapsed().seconds() >= SERVER_DEAL_RIVER_CARD_SEC + allInDelay) + if (m_delayTimer.elapsed().seconds() >= SERVER_DEAL_RIVER_CARD_SEC /*+ allInDelay*/) server.SetState(ServerRecvStateStartRound::Instance()); break; default: