sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes: "Bug ID 0000007: Highlighting of cards on split pot could be better " --> http://www.pokerth.net/mantis/view.php?id=7

Browse Source
This commit is contained in:
floty
2009-01-18 22:47:50 +00:00
parent 97617753fa
commit aac3e2c988
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/cardsvalue.cpp
+19 -2
View File
@@ -296,8 +296,8 @@ int array[7][3];
if(position) { if(position) {
// Position-Array fuellen // Position-Array fuellen
position[0] = array[j1][2]; position[0] = array[j1][2];
for(j3=1; j3<5; j3++) { for(j3=0; j3<4; j3++) {
position[j3] = array[j2+j3][2]; position[j3+1] = array[j2+j3][2];
} }
} }
return 800000000+3*1000000; 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]<array[k2][2]) {
ktemp[0] = array[k1][0];
ktemp[1] = array[k1][1];
ktemp[2] = array[k1][2];
array[k1][0] = array[k2][0];
array[k1][1] = array[k2][1];
array[k1][2] = array[k2][2];
array[k2][0] = ktemp[0];
array[k2][1] = ktemp[1];
array[k2][2] = ktemp[2];
}
}
}
// auf Vierling (Klasse 7) testen // auf Vierling (Klasse 7) testen
for(j1=0; j1<4; j1++) { for(j1=0; j1<4; j1++) {
if(array[j1][1] == array[j1+1][1] && array[j1][1] == array[j1+2][1] && array[j1][1] == array[j1+3][1]) { if(array[j1][1] == array[j1+1][1] && array[j1][1] == array[j1+2][1] && array[j1][1] == array[j1+3][1]) {
src/engine/local_engine/localhand.cpp
+9 -9
View File
@@ -104,11 +104,11 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardI
case 1: { case 1: {
tempBoardArray[0] = 43; tempBoardArray[0] = 3;
tempBoardArray[1] = 27; tempBoardArray[1] = 17;
tempBoardArray[2] = 26; tempBoardArray[2] = 18;
tempBoardArray[3] = 29; tempBoardArray[3] = 32;
tempBoardArray[4] = 28; tempBoardArray[4] = 33;
myBoard->setMyCards(tempBoardArray); myBoard->setMyCards(tempBoardArray);
@@ -121,8 +121,8 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardI
// player0 // player0
it = seatsList->begin(); it = seatsList->begin();
tempPlayerArray[0] = 30; tempPlayerArray[0] = 11;
tempPlayerArray[1] = 38; tempPlayerArray[1] = 12;
tempPlayerAndBoardArray[0] = tempPlayerArray[0]; tempPlayerAndBoardArray[0] = tempPlayerArray[0];
tempPlayerAndBoardArray[1] = tempPlayerArray[1]; tempPlayerAndBoardArray[1] = tempPlayerArray[1];
@@ -199,8 +199,8 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardI
// player6 // player6
it++; it++;
tempPlayerArray[0] = 22; tempPlayerArray[0] = 31;
tempPlayerArray[1] = 41; tempPlayerArray[1] = 19;
tempPlayerAndBoardArray[0] = tempPlayerArray[0]; tempPlayerAndBoardArray[0] = tempPlayerArray[0];
tempPlayerAndBoardArray[1] = tempPlayerArray[1]; tempPlayerAndBoardArray[1] = tempPlayerArray[1];
src/gui/qt/gametable/gametableimpl.cpp
+4
View File
@@ -2165,6 +2165,10 @@ void gameTableImpl::postRiverRunAnimation3() {
int bestHandPos[5]; int bestHandPos[5];
(*it_c)->getMyBestHandPosition(bestHandPos); (*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 //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; bool index0 = TRUE;
for(j=0; j<5; j++) { for(j=0; j<5; j++) {