From e36d878a077a99485f846304722fa6caf8af03cf Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 29 Oct 2007 09:18:34 +0000 Subject: [PATCH] Added code to run fast test games. --- src/net/common/servergamestate.cpp | 38 ++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index fe75060e..7d9c3989 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -36,18 +36,32 @@ using namespace std; -#define SERVER_WAIT_TIMEOUT_MSEC 50 -#define SERVER_DELAY_NEXT_HAND_SEC 10 -#define SERVER_DELAY_NEXT_GAME_SEC 10 -#define SERVER_DEAL_FLOP_CARDS_DELAY_SEC 5 -#define SERVER_DEAL_TURN_CARD_DELAY_SEC 2 -#define SERVER_DEAL_RIVER_CARD_DELAY_SEC 2 -#define SERVER_DEAL_ADD_ALL_IN_DELAY_SEC 2 -#define SERVER_SHOW_CARDS_DELAY_SEC 2 -#define SERVER_PLAYER_TIMEOUT_ADD_DELAY_SEC 2 -#define SERVER_COMPUTER_ACTION_DELAY_SEC 2 +//#define SERVER_TEST + #define SERVER_START_GAME_TIMEOUT_SEC 10 +#ifdef SERVER_TEST + #define SERVER_DELAY_NEXT_HAND_SEC 0 + #define SERVER_DELAY_NEXT_GAME_SEC 0 + #define SERVER_DEAL_FLOP_CARDS_DELAY_SEC 0 + #define SERVER_DEAL_TURN_CARD_DELAY_SEC 0 + #define SERVER_DEAL_RIVER_CARD_DELAY_SEC 0 + #define SERVER_DEAL_ADD_ALL_IN_DELAY_SEC 0 + #define SERVER_SHOW_CARDS_DELAY_SEC 0 + #define SERVER_PLAYER_TIMEOUT_ADD_DELAY_SEC 0 + #define SERVER_COMPUTER_ACTION_DELAY_SEC 0 +#else + #define SERVER_DELAY_NEXT_HAND_SEC 10 + #define SERVER_DELAY_NEXT_GAME_SEC 10 + #define SERVER_DEAL_FLOP_CARDS_DELAY_SEC 5 + #define SERVER_DEAL_TURN_CARD_DELAY_SEC 2 + #define SERVER_DEAL_RIVER_CARD_DELAY_SEC 2 + #define SERVER_DEAL_ADD_ALL_IN_DELAY_SEC 2 + #define SERVER_SHOW_CARDS_DELAY_SEC 2 + #define SERVER_PLAYER_TIMEOUT_ADD_DELAY_SEC 2 + #define SERVER_COMPUTER_ACTION_DELAY_SEC 2 +#endif + #define SERVER_COMPUTER_PLAYER_NAME "Computer" // Helper functions @@ -835,7 +849,11 @@ ServerGameStateWaitPlayerAction::Process(ServerGameThread &server) server.SetState(ServerGameStateStartRound::Instance()); retVal = MSG_NET_GAME_SERVER_ACTION; } +#ifdef SERVER_TEST + else if (true) +#else else if (GetTimer().elapsed().total_seconds() >= server.GetGameData().playerActionTimeoutSec + SERVER_PLAYER_TIMEOUT_ADD_DELAY_SEC) +#endif { // Player did not act fast enough. Act for him. if (server.GetGame().getCurrentHand()->getCurrentBeRo()->getHighestSet() == curPlayer->getMySet())