diff --git a/src/engine/local_engine/log.cpp b/src/engine/local_engine/log.cpp index aa217e01..319cbef9 100644 --- a/src/engine/local_engine/log.cpp +++ b/src/engine/local_engine/log.cpp @@ -18,6 +18,12 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include +#include +#include +#include +#include "configfile.h" +#include "game_defs.h" #include "log.h" using namespace std; @@ -150,7 +156,7 @@ Log::~Log() } void -Log::logNewGameMsg(int gameID, Game *currentGame) { +Log::logNewGameMsg(int gameID, int startCash, int startSmallBlind, unsigned dealerPosition, PlayerList seatsList) { if(SQLITE_LOG) { @@ -175,11 +181,11 @@ Log::logNewGameMsg(int gameID, Game *currentGame) { } sql += ") VALUES ("; sql += boost::lexical_cast(gameID); - sql += "," + boost::lexical_cast(currentGame->getStartCash()); - sql += "," + boost::lexical_cast(currentGame->getStartSmallBlind()); - sql += "," + boost::lexical_cast(currentGame->getDealerPosition()); + sql += "," + boost::lexical_cast(startCash); + sql += "," + boost::lexical_cast(startSmallBlind); + sql += "," + boost::lexical_cast(dealerPosition); - for(it_c = currentGame->getCurrentHand()->getSeatsList()->begin();it_c!=currentGame->getCurrentHand()->getSeatsList()->end();it_c++) { + for(it_c = seatsList->begin();it_c!=seatsList->end();it_c++) { if((*it_c)->getMyActiveStatus()) { sql += ",\"" + (*it_c)->getMyName() +"\""; } else { diff --git a/src/engine/local_engine/log.h b/src/engine/local_engine/log.h index 7cf83fed..d1c77a52 100644 --- a/src/engine/local_engine/log.h +++ b/src/engine/local_engine/log.h @@ -20,17 +20,10 @@ #ifndef LOG_H #define LOG_H -#include -#include -#include -#include +#include "playerinterface.h" -#include "game.h" -#include "handinterface.h" -#include "configfile.h" -#include "game_defs.h" - -//class Game; +struct sqlite3; +class ConfigFile; class Log { @@ -40,7 +33,7 @@ public: ~Log(); - void logNewGameMsg(int, Game*); + void logNewGameMsg(int, int, int, unsigned, PlayerList); // void closeLogDbAtExit(); diff --git a/src/game.cpp b/src/game.cpp index fc2a49df..23b2c8cb 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -31,8 +31,8 @@ using namespace std; Game::Game(GuiInterface* gui, boost::shared_ptr factory, const PlayerDataList &playerDataList, const GameData &gameData, - const StartData &startData, int gameId) -: myFactory(factory), myGui(gui), currentHand(0), currentBoard(0), + const StartData &startData, int gameId, Log* log) +: myFactory(factory), myGui(gui), myLog(log), currentHand(0), currentBoard(0), startQuantityPlayers(startData.numberOfPlayers), startCash(gameData.startMoney), startSmallBlind(gameData.firstSmallBlind), myGameID(gameId), currentSmallBlind(gameData.firstSmallBlind), currentHandID(0), dealerPosition(0), lastHandBlindsRaised(1), lastTimeBlindsRaised(0), myGameData(gameData) @@ -108,6 +108,9 @@ Game::Game(GuiInterface* gui, boost::shared_ptr factory, currentBoard->setPlayerLists(seatsList, activePlayerList, runningPlayerList); + // log game data +// myLog->logNewGameMsg(myGameID, startCash, startSmallBlind, dealerPosition, seatsList); + //start timer blindsTimer.reset(); blindsTimer.start(); diff --git a/src/game.h b/src/game.h index 52262bbc..7acaf51e 100755 --- a/src/game.h +++ b/src/game.h @@ -23,10 +23,12 @@ #include #include "gamedata.h" #include "playerdata.h" +#include "log.h" #include class GuiInterface; +class Log; class HandInterface; class PlayerInterface; class BoardInterface; @@ -41,9 +43,9 @@ typedef std::list >::const_iterator PlayerLis class Game { public: - Game(GuiInterface *gui, boost::shared_ptr factory, + Game(GuiInterface *gui, boost::shared_ptr factory, const PlayerDataList &playerDataList, const GameData &gameData, - const StartData &startData, int gameId); + const StartData &startData, int gameId, Log *myLog = 0); ~Game(); @@ -85,6 +87,7 @@ private: boost::shared_ptr myFactory; GuiInterface *myGui; + Log *myLog; HandInterface *currentHand; BoardInterface *currentBoard; diff --git a/src/session.cpp b/src/session.cpp index b6b563fb..094a7d26 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -21,6 +21,7 @@ #include #include "session.h" #include "game.h" +#include "log.h" #include "guiinterface.h" #include "configfile.h" #include @@ -116,7 +117,7 @@ void Session::startLocalGame(const GameData &gameData, const StartData &startDat // EngineFactory erstellen boost::shared_ptr factory(new LocalEngineFactory(myConfig)); // LocalEngine erstellen - currentGame.reset(new Game(myGui, factory, playerDataList, gameData, startData, currentGameNum)); + currentGame.reset(new Game(myGui, factory, playerDataList, gameData, startData, currentGameNum, myLog)); //// SPIEL-SCHLEIFE currentGame->initHand(); diff --git a/src/session.h b/src/session.h index 946fcd94..dcad002b 100755 --- a/src/session.h +++ b/src/session.h @@ -23,7 +23,6 @@ #include #include -#include "log.h" #include "serverdata.h" #include "gamedata.h" #include "playerdata.h"