From dc0212bbc9334bda4135503a3bf4776bfb1dbef1 Mon Sep 17 00:00:00 2001 From: lotodore Date: Wed, 22 Aug 2007 23:00:51 +0000 Subject: [PATCH] Changed networking code for new postRiverRun. --- src/engine/local_engine/localberopostriver.cpp | 2 ++ src/engine/local_engine/localberopostriver.h | 2 ++ src/net/common/servergamestate.cpp | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/engine/local_engine/localberopostriver.cpp b/src/engine/local_engine/localberopostriver.cpp index 5f0f3b05..97ce2246 100644 --- a/src/engine/local_engine/localberopostriver.cpp +++ b/src/engine/local_engine/localberopostriver.cpp @@ -33,6 +33,8 @@ LocalBeRoPostRiver::~LocalBeRoPostRiver() { } +void LocalBeRoPostRiver::run() { +} void LocalBeRoPostRiver::postRiverRun() { diff --git a/src/engine/local_engine/localberopostriver.h b/src/engine/local_engine/localberopostriver.h index bafd5545..a6e4bde1 100644 --- a/src/engine/local_engine/localberopostriver.h +++ b/src/engine/local_engine/localberopostriver.h @@ -34,6 +34,8 @@ public: void setHighestCardsValue(int theValue) { highestCardsValue = theValue;} int getHighestCardsValue() const { return highestCardsValue;} + void run(); + void postRiverRun(); void distributePot(); diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index b63ff315..a96ce00d 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -514,7 +514,7 @@ ServerGameStateStartRound::Process(ServerGameThread &server) // Main game loop. int curRound = curGame.getCurrentHand()->getActualRound(); curGame.getCurrentHand()->switchRounds(); - if (!curGame.getCurrentHand()->getAllInCondition() && curGame.getCurrentHand()->getActualRound() != GAME_STATE_POST_RIVER) + if (!curGame.getCurrentHand()->getAllInCondition()) curGame.getCurrentHand()->getCurrentBeRo()->run(); int newRound = curGame.getCurrentHand()->getActualRound(); @@ -590,7 +590,7 @@ ServerGameStateStartRound::Process(ServerGameThread &server) else // hand is over { // Engine will find out who won. - curGame.getCurrentHand()->getCurrentBeRo()->run(); + curGame.getCurrentHand()->getCurrentBeRo()->postRiverRun(); // Retrieve active players. If only one player is left, no cards are shown. std::list > activePlayers = GetActivePlayers(curGame);