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:

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() {
+HandInterface* LocalEngineFactory::createHand() { /*return new LocalHand;*/ }
-/*
-	 new LocalHand;	
-	return hi;*/	
-}
 
+BoardInterface* LocalEngineFactory::createBoard() { return new LocalBoard; }
 
-BoardInterface* LocalEngineFactory::createBoard() {
+PlayerInterface* LocalEngineFactory::createPlayer() { /*return new LocalPlayer;*/ }
 
-// 	BoardInterface *bi = new LocalBoard();	
+PreflopInterface* LocalEngineFactory::createPreflop() {/* return new LocalPreflop;*/ }
-// 	return bi;	
-}
 
+FlopInterface* LocalEngineFactory::createFlop() { /*return new LocalFlop;*/ }
 
-PlayerInterface* LocalEngineFactory::createPlayer() {
+TurnInterface* LocalEngineFactory::createTurn() { /*return new LocalTurn;*/ }
 
-// 	PlayerInterface *pi = new LocalPlayer();	
+RiverInterface* LocalEngineFactory::createRiver() { /*return new LocalRiver;*/ }
-// 	return pi;	
-
-}

src/engine/local_engine/localenginefactory.h

@@ -22,6 +22,8 @@
 
 #include <enginefactory.h>
 
+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

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;