From ccd74ccb92efaee22bfc05552dde2a6a6c41e792 Mon Sep 17 00:00:00 2001 From: doitux Date: Sat, 13 Jan 2007 20:47:48 +0000 Subject: [PATCH] --- src/engine/enginefactory.h | 12 ++++++- .../local_engine/localenginefactory.cpp | 31 +++++++------------ src/engine/local_engine/localenginefactory.h | 7 ++++- src/game.cpp | 19 +++++++++--- 4 files changed, 43 insertions(+), 26 deletions(-) diff --git a/src/engine/enginefactory.h b/src/engine/enginefactory.h index 0ce15106..5e24502b 100644 --- a/src/engine/enginefactory.h +++ b/src/engine/enginefactory.h @@ -20,11 +20,21 @@ #ifndef ENGINEFACTORY_H #define ENGINEFACTORY_H - +#include "boardinterface.h" +#include "handinterface.h" +#include "playerinterface.h" +#include "preflopinterface.h" +#include "flopinterface.h" +#include "turninterface.h" +#include "riverinterface.h" class HandInterface; class BoardInterface; class PlayerInterface; +class PreflopInterface; +class FlopInterface; +class TurnInterface; +class RiverInterface; class EngineFactory{ public: diff --git a/src/engine/local_engine/localenginefactory.cpp b/src/engine/local_engine/localenginefactory.cpp index 887cf652..1078009e 100644 --- a/src/engine/local_engine/localenginefactory.cpp +++ b/src/engine/local_engine/localenginefactory.cpp @@ -20,14 +20,12 @@ #include "localenginefactory.h" #include "localhand.h" - - #include "localboard.h" -#include "boardinterface.h" - #include "localplayer.h" -#include "playerinterface.h" - +#include "localpreflop.h" +#include "localflop.h" +#include "localturn.h" +#include "localriver.h" LocalEngineFactory::LocalEngineFactory() : EngineFactory() @@ -40,23 +38,16 @@ LocalEngineFactory::~LocalEngineFactory() } -HandInterface* LocalEngineFactory::createHand() { -/* - new LocalHand; - return hi;*/ -} +HandInterface* LocalEngineFactory::createHand() { /*return new LocalHand;*/ } +BoardInterface* LocalEngineFactory::createBoard() { return new LocalBoard; } -BoardInterface* LocalEngineFactory::createBoard() { +PlayerInterface* LocalEngineFactory::createPlayer() { /*return new LocalPlayer;*/ } -// BoardInterface *bi = new LocalBoard(); -// return bi; -} +PreflopInterface* LocalEngineFactory::createPreflop() {/* return new LocalPreflop;*/ } +FlopInterface* LocalEngineFactory::createFlop() { /*return new LocalFlop;*/ } -PlayerInterface* LocalEngineFactory::createPlayer() { +TurnInterface* LocalEngineFactory::createTurn() { /*return new LocalTurn;*/ } -// PlayerInterface *pi = new LocalPlayer(); -// return pi; - -} +RiverInterface* LocalEngineFactory::createRiver() { /*return new LocalRiver;*/ } diff --git a/src/engine/local_engine/localenginefactory.h b/src/engine/local_engine/localenginefactory.h index dd135d25..df0558e5 100644 --- a/src/engine/local_engine/localenginefactory.h +++ b/src/engine/local_engine/localenginefactory.h @@ -22,6 +22,8 @@ #include +class BoardInterface; + class LocalEngineFactory : public EngineFactory { public: @@ -32,7 +34,10 @@ public: HandInterface* createHand(); BoardInterface* createBoard(); PlayerInterface* createPlayer(); - + PreflopInterface* createPreflop(); + FlopInterface* createFlop(); + TurnInterface* createTurn(); + RiverInterface* createRiver(); }; #endif diff --git a/src/game.cpp b/src/game.cpp index 7f217bc0..a256b83b 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -20,8 +20,17 @@ #include "game.h" #include "localhand.h" + + +#include "enginefactory.h" +#include "localenginefactory.h" + #include "guiinterface.h" +#include "boardinterface.h" +#include "playerinterface.h" +#include "handinterface.h" + using namespace std; @@ -33,15 +42,17 @@ Game::Game(GuiInterface* g, int qP, int sC, int sB) : myGui(g), actualHand(0), a playerArray[i] = 0; } -// myEngine = new EngineWrapper(); - - myGui->setGame(this); + + //EngineFactory erstellen + EngineFactory *myFactory; + myFactory = new LocalEngineFactory; // LocalEngine erstellen -// myGui->setGameEngine(myEngine); // Board erstellen actualBoard = new LocalBoard(); + + // ersten Dealer bestimmen Tools myTool;