diff --git a/src/engine/enginefactory.h b/src/engine/enginefactory.h index 84d85e59..66becba4 100644 --- a/src/engine/enginefactory.h +++ b/src/engine/enginefactory.h @@ -34,13 +34,13 @@ public: virtual ~EngineFactory(); - virtual HandInterface* createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int qP, int dP, int sB,int sC) =0; + virtual HandInterface* createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC) =0; virtual BoardInterface* createBoard() =0; virtual PlayerInterface* createPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB) =0; - virtual PreflopInterface* createPreflop(HandInterface* hi, int id, int qP, int dP, int sB) =0; - virtual FlopInterface* createFlop(HandInterface* hi, int id, int qP, int dP, int sB) =0; - virtual TurnInterface* createTurn(HandInterface* hi, int id, int qP, int dP, int sB) =0; - virtual RiverInterface* createRiver(HandInterface* hi, int id, int qP, int dP, int sB) =0; + virtual PreflopInterface* createPreflop(HandInterface* hi, int id, int aP, int dP, int sB) =0; + virtual FlopInterface* createFlop(HandInterface* hi, int id, int aP, int dP, int sB) =0; + virtual TurnInterface* createTurn(HandInterface* hi, int id, int aP, int dP, int sB) =0; + virtual RiverInterface* createRiver(HandInterface* hi, int id, int aP, int dP, int sB) =0; }; diff --git a/src/engine/local_engine/localenginefactory.cpp b/src/engine/local_engine/localenginefactory.cpp index 289527d1..4bd45cde 100644 --- a/src/engine/local_engine/localenginefactory.cpp +++ b/src/engine/local_engine/localenginefactory.cpp @@ -31,16 +31,16 @@ LocalEngineFactory::~LocalEngineFactory() } -HandInterface* LocalEngineFactory::createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int qP, int dP, int sB,int sC) { return new LocalHand(f, g, b, p, id, qP, dP, sB, sC); } +HandInterface* LocalEngineFactory::createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC) { return new LocalHand(f, g, b, p, id, sP, aP, dP, sB, sC); } BoardInterface* LocalEngineFactory::createBoard() { return new LocalBoard; } PlayerInterface* LocalEngineFactory::createPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB) { return new LocalPlayer(b, id, name, sC, aS, mB); } -PreflopInterface* LocalEngineFactory::createPreflop(HandInterface* hi, int id, int qP, int dP, int sB) { return new LocalPreflop(hi, id, qP, dP, sB); } +PreflopInterface* LocalEngineFactory::createPreflop(HandInterface* hi, int id, int aP, int dP, int sB) { return new LocalPreflop(hi, id, aP, dP, sB); } -FlopInterface* LocalEngineFactory::createFlop(HandInterface* hi, int id, int qP, int dP, int sB) { return new LocalFlop(hi, id, qP, dP, sB); } +FlopInterface* LocalEngineFactory::createFlop(HandInterface* hi, int id, int aP, int dP, int sB) { return new LocalFlop(hi, id, aP, dP, sB); } -TurnInterface* LocalEngineFactory::createTurn(HandInterface* hi, int id, int qP, int dP, int sB) { return new LocalTurn(hi, id, qP, dP, sB); } +TurnInterface* LocalEngineFactory::createTurn(HandInterface* hi, int id, int aP, int dP, int sB) { return new LocalTurn(hi, id, aP, dP, sB); } -RiverInterface* LocalEngineFactory::createRiver(HandInterface* hi, int id, int qP, int dP, int sB) { return new LocalRiver(hi, id, qP, dP, sB); } +RiverInterface* LocalEngineFactory::createRiver(HandInterface* hi, int id, int aP, int dP, int sB) { return new LocalRiver(hi, id, aP, dP, sB); } diff --git a/src/engine/local_engine/localenginefactory.h b/src/engine/local_engine/localenginefactory.h index 0c88df1d..3cca8101 100644 --- a/src/engine/local_engine/localenginefactory.h +++ b/src/engine/local_engine/localenginefactory.h @@ -37,13 +37,13 @@ public: ~LocalEngineFactory(); - HandInterface* createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int qP, int dP, int sB,int sC); + HandInterface* createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC); BoardInterface* createBoard(); PlayerInterface* createPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB); - PreflopInterface* createPreflop(HandInterface* hi, int id, int qP, int dP, int sB); - FlopInterface* createFlop(HandInterface* hi, int id, int qP, int dP, int sB); - TurnInterface* createTurn(HandInterface* hi, int id, int qP, int dP, int sB); - RiverInterface* createRiver(HandInterface* hi, int id, int qP, int dP, int sB); + PreflopInterface* createPreflop(HandInterface* hi, int id, int aP, int dP, int sB); + FlopInterface* createFlop(HandInterface* hi, int id, int aP, int dP, int sB); + TurnInterface* createTurn(HandInterface* hi, int id, int aP, int dP, int sB); + RiverInterface* createRiver(HandInterface* hi, int id, int aP, int dP, int sB); }; #endif diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index abdbf6fb..7f268f99 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -21,7 +21,7 @@ using namespace std; -LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int qP, int dP, int sB,int sC) : HandInterface(), myFactory(f), myGui(g), myBoard(b), playerArray(p), myPreflop(0), myFlop(0), myTurn(0), myRiver(0), myID(id), actualQuantityPlayers(qP), startQuantityPlayers(qP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), allInCondition(0) +LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC) : HandInterface(), myFactory(f), myGui(g), myBoard(b), playerArray(p), myPreflop(0), myFlop(0), myTurn(0), myRiver(0), myID(id), actualQuantityPlayers(aP), startQuantityPlayers(sP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), allInCondition(0) { int i, j; diff --git a/src/engine/local_engine/localhand.h b/src/engine/local_engine/localhand.h index d63f109e..6270f26f 100755 --- a/src/engine/local_engine/localhand.h +++ b/src/engine/local_engine/localhand.h @@ -37,7 +37,7 @@ class LocalHand : public HandInterface{ public: - LocalHand(EngineFactory*, GuiInterface*, BoardInterface*, PlayerInterface**, int, int, int, int, int); + LocalHand(EngineFactory*, GuiInterface*, BoardInterface*, PlayerInterface**, int, int, int, int, int, int); ~LocalHand(); diff --git a/src/game.cpp b/src/game.cpp index 35f543a1..a85fbbe3 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -127,7 +127,7 @@ void Game::startHand() } // Hand erstellen - actualHand = myFactory->createHand(myFactory, myGui, actualBoard, playerArray, actualHandID, actualQuantityPlayers, dealerPosition, actualSmallBlind, startCash); + actualHand = myFactory->createHand(myFactory, myGui, actualBoard, playerArray, actualHandID, startQuantityPlayers, actualQuantityPlayers, dealerPosition, actualSmallBlind, startCash); //GUI bereinigen