BeRo refactoring

src/gui/generic/serverguiwrapper.cpp

@@ -72,6 +72,8 @@ void ServerGuiWrapper::dealRiverCard() {}
 
 void ServerGuiWrapper::nextPlayerAnimation() {}
 
+void ServerGuiWrapper::beRoAnimation2(int myBeRoID) {}
+
 void ServerGuiWrapper::preflopAnimation1() {}
 void ServerGuiWrapper::preflopAnimation2() {}
 

src/gui/generic/serverguiwrapper.h

@@ -56,6 +56,8 @@ public:
 
 	void nextPlayerAnimation();
 
+	void beRoAnimation2(int);
+
 	void preflopAnimation1();
 	void preflopAnimation2();
 	

src/gui/guiinterface.h

@@ -62,6 +62,8 @@ public:
 
 	virtual void nextPlayerAnimation()=0;
 
+	virtual void beRoAnimation2(int)=0;
+
 	virtual void preflopAnimation1()=0;
 	virtual void preflopAnimation2()=0;
 

src/gui/qt/guiwrapper.cpp

@@ -75,6 +75,8 @@ void GuiWrapper::dealRiverCard() { myW->signalDealRiverCards0(); }
 
 void GuiWrapper::nextPlayerAnimation() { myW->signalNextPlayerAnimation(); }
 
+void GuiWrapper::beRoAnimation2(int myBeRoID) { myW->signalBeRoAnimation2(myBeRoID); }
+
 void GuiWrapper::preflopAnimation1() { myW->signalPreflopAnimation1(); }
 void GuiWrapper::preflopAnimation2() { myW->signalPreflopAnimation2(); }
 

src/gui/qt/guiwrapper.h

@@ -63,6 +63,8 @@ public:
 
 	void nextPlayerAnimation();
 
+	void beRoAnimation2(int);
+	
 	void preflopAnimation1();
 	void preflopAnimation2();
 	

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -613,6 +613,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 
 	connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation()));
 
+		;
+	connect(this, SIGNAL(signalBeRoAnimation2(int)), this, SLOT(beRoAnimation2(int)));
+
 	connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1()));
 	connect(this, SIGNAL(signalPreflopAnimation2()), this, SLOT(preflopAnimation2()));
 	connect(this, SIGNAL(signalFlopAnimation1()), this, SLOT(flopAnimation1()));
@@ -1829,30 +1832,47 @@ void mainWindowImpl::nextPlayerAnimation() {
 	nextPlayerAnimationTimer->start(nextPlayerSpeed1);
 }
 
+void mainWindowImpl::beRoAnimation2(int myBeRoID) {
+
+	switch(myBeRoID) {
+
+		case 0: { preflopAnimation2(); }
+		break;
+		case 1: { flopAnimation2(); }
+		break;
+		case 2: { turnAnimation2(); }
+		break;
+		case 3: { riverAnimation2(); }
+		break;
+		default: { cout << "beRoAnimation2 Error" << endl; }
+	}
+}
+
+
 void mainWindowImpl::preflopAnimation1() { preflopAnimation1Timer->start(nextPlayerSpeed2); }
 void mainWindowImpl::preflopAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getPreflop()->run(); }
 
 void mainWindowImpl::preflopAnimation2() { preflopAnimation2Timer->start(preflopNextPlayerSpeed); }
-void mainWindowImpl::preflopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getPreflop()->nextPlayer2(); }
+void mainWindowImpl::preflopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getPreflop()->nextPlayer(); }
 
 
 void mainWindowImpl::flopAnimation1() { flopAnimation1Timer->start(nextPlayerSpeed2); }
 void mainWindowImpl::flopAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getFlop()->run(); }
 
 void mainWindowImpl::flopAnimation2() { flopAnimation2Timer->start(nextPlayerSpeed3); }
-void mainWindowImpl::flopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getFlop()->nextPlayer2(); }
+void mainWindowImpl::flopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getFlop()->nextPlayer(); }
 
 void mainWindowImpl::turnAnimation1() { turnAnimation1Timer->start(nextPlayerSpeed2); }
 void mainWindowImpl::turnAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getTurn()->run(); }
 
 void mainWindowImpl::turnAnimation2() { turnAnimation2Timer->start(nextPlayerSpeed3); }
-void mainWindowImpl::turnAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getTurn()->nextPlayer2(); }
+void mainWindowImpl::turnAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getTurn()->nextPlayer(); }
 
 void mainWindowImpl::riverAnimation1() { riverAnimation1Timer->start(nextPlayerSpeed2); }
 void mainWindowImpl::riverAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->run(); }
 
 void mainWindowImpl::riverAnimation2() { riverAnimation2Timer->start(nextPlayerSpeed3); }
-void mainWindowImpl::riverAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->nextPlayer2(); }
+void mainWindowImpl::riverAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->nextPlayer(); }
 
 void mainWindowImpl::postRiverAnimation1() { postRiverAnimation1Timer->start(nextPlayerSpeed2); }
 void mainWindowImpl::postRiverAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->postRiverRun(); }

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -104,6 +104,8 @@ signals:
 
 	void signalNextPlayerAnimation();
 
+	void signalBeRoAnimation2(int);
+
 	void signalPreflopAnimation1();
 	void signalPreflopAnimation2();
 	void signalFlopAnimation1();
@@ -201,6 +203,8 @@ public slots:
 
 	void nextPlayerAnimation();
 
+	void beRoAnimation2(int);
+
 	void preflopAnimation1();
 	void preflopAnimation1Action();
 	void preflopAnimation2();