diff --git a/src/engine/local_engine/cardsvalue.cpp b/src/engine/local_engine/cardsvalue.cpp index 1d8a858b..1e808de6 100755 --- a/src/engine/local_engine/cardsvalue.cpp +++ b/src/engine/local_engine/cardsvalue.cpp @@ -296,8 +296,8 @@ int array[7][3]; if(position) { // Position-Array fuellen position[0] = array[j1][2]; - for(j3=1; j3<5; j3++) { - position[j3] = array[j2+j3][2]; + for(j3=0; j3<4; j3++) { + position[j3+1] = array[j2+j3][2]; } } return 800000000+3*1000000; @@ -339,6 +339,23 @@ int array[7][3]; } } + // nach Position sortieren: erst board, dann hole cards + for(k1=0; k1<7; k1++) { + for(k2=k1+1; k2<7; k2++) { + if(array[k1][1]==array[k2][1] && array[k1][2] f, GuiInterface *g, BoardI case 1: { - tempBoardArray[0] = 43; - tempBoardArray[1] = 27; - tempBoardArray[2] = 26; - tempBoardArray[3] = 29; - tempBoardArray[4] = 28; + tempBoardArray[0] = 3; + tempBoardArray[1] = 17; + tempBoardArray[2] = 18; + tempBoardArray[3] = 32; + tempBoardArray[4] = 33; myBoard->setMyCards(tempBoardArray); @@ -121,8 +121,8 @@ LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardI // player0 it = seatsList->begin(); - tempPlayerArray[0] = 30; - tempPlayerArray[1] = 38; + tempPlayerArray[0] = 11; + tempPlayerArray[1] = 12; tempPlayerAndBoardArray[0] = tempPlayerArray[0]; tempPlayerAndBoardArray[1] = tempPlayerArray[1]; @@ -199,8 +199,8 @@ LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardI // player6 it++; - tempPlayerArray[0] = 22; - tempPlayerArray[1] = 41; + tempPlayerArray[0] = 31; + tempPlayerArray[1] = 19; tempPlayerAndBoardArray[0] = tempPlayerArray[0]; tempPlayerAndBoardArray[1] = tempPlayerArray[1]; diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 812bc96c..7881dddb 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -2165,6 +2165,10 @@ void gameTableImpl::postRiverRunAnimation3() { int bestHandPos[5]; (*it_c)->getMyBestHandPosition(bestHandPos); +// for(j=0; j<5; j++) { +// cout << bestHandPos[j] << endl; +// } + //index 0 testen --> Karte darf nicht im MyBestHand Position Array drin sein, es darf nicht nur ein Spieler Aktiv sein, die Config fordert die Animation bool index0 = TRUE; for(j=0; j<5; j++) {