diff --git a/src/engine/local_engine/localberopostriver.cpp b/src/engine/local_engine/localberopostriver.cpp index 0f84dc74..9d863e17 100644 --- a/src/engine/local_engine/localberopostriver.cpp +++ b/src/engine/local_engine/localberopostriver.cpp @@ -65,7 +65,6 @@ void LocalBeRoPostRiver::run() { // Pot-Verteilung getMyHand()->getBoard()->distributePot(); -// distributePot(); //Pot auf 0 setzen getMyHand()->getBoard()->setPot(0); diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index d3b13d0c..1fb50aff 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -100,70 +100,70 @@ LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardI // !!!!!!!!!!!!!!!!!!!!!!!!!!!!! testing !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // - int temp5Array[5]; - - tempBoardArray[0] = 8; - tempBoardArray[1] = 9; - tempBoardArray[2] = 10; - tempBoardArray[3] = 11; - tempBoardArray[4] = 13; - - myBoard->setMyCards(tempBoardArray); - - tempPlayerAndBoardArray[2] = tempBoardArray[0]; - tempPlayerAndBoardArray[3] = tempBoardArray[1]; - tempPlayerAndBoardArray[4] = tempBoardArray[2]; - tempPlayerAndBoardArray[5] = tempBoardArray[3]; - tempPlayerAndBoardArray[6] = tempBoardArray[4]; - - tempPlayerArray[0] = 13; - tempPlayerArray[1] = 25; - tempPlayerAndBoardArray[0] = tempPlayerArray[0]; - tempPlayerAndBoardArray[1] = tempPlayerArray[1]; - - playerArray[0]->setMyCards(tempPlayerArray); - playerArray[0]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); - - playerArray[0]->setMyBestHandPosition(temp5Array); - -// for(i=0; i<5; i++) { -// cout << temp5Array[i] << " "; -// } -// cout << endl; - - tempPlayerArray[0] = 23; - tempPlayerArray[1] = 15; - tempPlayerAndBoardArray[0] = tempPlayerArray[0]; - tempPlayerAndBoardArray[1] = tempPlayerArray[1]; - - playerArray[1]->setMyCards(tempPlayerArray); - playerArray[1]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); - - playerArray[1]->setMyBestHandPosition(temp5Array); - - tempPlayerArray[0] = 20; - tempPlayerArray[1] = 38; - tempPlayerAndBoardArray[0] = tempPlayerArray[0]; - tempPlayerAndBoardArray[1] = tempPlayerArray[1]; - - playerArray[2]->setMyCards(tempPlayerArray); - playerArray[2]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); - - playerArray[2]->setMyBestHandPosition(temp5Array); - - tempPlayerArray[0] = 19; - tempPlayerArray[1] = 21; - tempPlayerAndBoardArray[0] = tempPlayerArray[0]; - tempPlayerAndBoardArray[1] = tempPlayerArray[1]; - - playerArray[3]->setMyCards(tempPlayerArray); - playerArray[3]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); - - playerArray[3]->setMyBestHandPosition(temp5Array); - -// for(i=0; i<4; i++) { -// cout << i << ": " << playerArray[i]->getMyCardsValueInt() << endl; -// } +// // int temp5Array[5]; +// // +// // tempBoardArray[0] = 8; +// // tempBoardArray[1] = 9; +// // tempBoardArray[2] = 10; +// // tempBoardArray[3] = 11; +// // tempBoardArray[4] = 13; +// // +// // myBoard->setMyCards(tempBoardArray); +// // +// // tempPlayerAndBoardArray[2] = tempBoardArray[0]; +// // tempPlayerAndBoardArray[3] = tempBoardArray[1]; +// // tempPlayerAndBoardArray[4] = tempBoardArray[2]; +// // tempPlayerAndBoardArray[5] = tempBoardArray[3]; +// // tempPlayerAndBoardArray[6] = tempBoardArray[4]; +// // +// // tempPlayerArray[0] = 13; +// // tempPlayerArray[1] = 25; +// // tempPlayerAndBoardArray[0] = tempPlayerArray[0]; +// // tempPlayerAndBoardArray[1] = tempPlayerArray[1]; +// // +// // playerArray[0]->setMyCards(tempPlayerArray); +// // playerArray[0]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); +// // +// // playerArray[0]->setMyBestHandPosition(temp5Array); +// // +// // // for(i=0; i<5; i++) { +// // // cout << temp5Array[i] << " "; +// // // } +// // // cout << endl; +// // +// // tempPlayerArray[0] = 31; +// // tempPlayerArray[1] = 18; +// // tempPlayerAndBoardArray[0] = tempPlayerArray[0]; +// // tempPlayerAndBoardArray[1] = tempPlayerArray[1]; +// // +// // playerArray[1]->setMyCards(tempPlayerArray); +// // playerArray[1]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); +// // +// // playerArray[1]->setMyBestHandPosition(temp5Array); +// // +// // tempPlayerArray[0] = 20; +// // tempPlayerArray[1] = 38; +// // tempPlayerAndBoardArray[0] = tempPlayerArray[0]; +// // tempPlayerAndBoardArray[1] = tempPlayerArray[1]; +// // +// // playerArray[2]->setMyCards(tempPlayerArray); +// // playerArray[2]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); +// // +// // playerArray[2]->setMyBestHandPosition(temp5Array); +// // +// // tempPlayerArray[0] = 19; +// // tempPlayerArray[1] = 51; +// // tempPlayerAndBoardArray[0] = tempPlayerArray[0]; +// // tempPlayerAndBoardArray[1] = tempPlayerArray[1]; +// // +// // playerArray[3]->setMyCards(tempPlayerArray); +// // playerArray[3]->setMyCardsValueInt(myCardsValue.cardsValue(tempPlayerAndBoardArray,temp5Array)); +// // +// // playerArray[3]->setMyBestHandPosition(temp5Array); +// // +// // // for(i=0; i<4; i++) { +// // // cout << i << ": " << playerArray[i]->getMyCardsValueInt() << endl; +// // // } // ---------------------------------------- diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp index 20aacecd..408489b2 100755 --- a/src/engine/local_engine/localplayer.cpp +++ b/src/engine/local_engine/localplayer.cpp @@ -40,9 +40,9 @@ LocalPlayer::LocalPlayer(ConfigFile *c, BoardInterface *b, int id, unsigned uniq // if(myID==1) { // myCash=6130; // } - if(myID==2) { - myCash=37; - } +// if(myID==2) { +// myCash=37; +// } //////////////////////////// // myBestHandPosition mit -1 initialisieren diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index eed460ff..53c8bf17 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -56,7 +56,7 @@ using namespace std; mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) - : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(1), breakAfterActualHand(FALSE) + : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(0), breakAfterActualHand(FALSE) { int i;