adds activePlayerList and runningPlayerList (XII) - BUGGY!!! - last sable rev866

This commit is contained in:
doitux
2007-09-26 00:08:45 +00:00
parent 0ea06c8a96
commit 8ac5673c00
2 changed files with 6 additions and 13 deletions
+3 -3
View File
@@ -146,7 +146,7 @@ void LocalBeRoPreflop::run() {
// determine next player // determine next player
cout << "playerID begin preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; // cout << "playerID begin preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl;
it = getCurrentPlayersTurnIt(); it = getCurrentPlayersTurnIt();
@@ -156,9 +156,9 @@ void LocalBeRoPreflop::run() {
if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) setCurrentPlayersTurnIt(getMyHand()->getRunningPlayerList()->begin()); if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) setCurrentPlayersTurnIt(getMyHand()->getRunningPlayerList()->begin());
if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) cout << "!!!" << endl; // if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) cout << "!!!" << endl;
cout << "playerID middle preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; // cout << "playerID middle preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl;
// exceptions // exceptions
// if next player is small blind and only all-in-big-blind with less than smallblind amount is nonfold too -> preflop is over // if next player is small blind and only all-in-big-blind with less than smallblind amount is nonfold too -> preflop is over
+3 -10
View File
@@ -2083,7 +2083,7 @@ void mainWindowImpl::postRiverRunAnimation3() {
actionLabelArray[i]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/action_winner.png")); actionLabelArray[i]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/action_winner.png"));
//show winnercards if more than one player is active //show winnercards if more than one player is active
if ( currentHand->getActivePlayerList()->size() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) { if ( currentHand->getRunningPlayerList()->size() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) {
int j; int j;
int bestHandPos[5]; int bestHandPos[5];
@@ -2407,10 +2407,7 @@ void mainWindowImpl::nextRoundCleanGui() {
//Clean breakbutton //Clean breakbutton
blinkingStartButtonAnimationTimer->stop(); blinkingStartButtonAnimationTimer->stop();
QPalette tempPalette = pushButton_break->palette(); pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
tempPalette.setColor(QPalette::Button, QColor(40,82,0));
tempPalette.setColor(QPalette::ButtonText, QColor(240,240,240));
pushButton_break->setPalette(tempPalette);
blinkingStartButtonAnimationTimer->stop(); blinkingStartButtonAnimationTimer->stop();
QFontMetrics tempMetrics = this->fontMetrics(); QFontMetrics tempMetrics = this->fontMetrics();
int width = tempMetrics.width(tr("Stop")); int width = tempMetrics.width(tr("Stop"));
@@ -2484,11 +2481,7 @@ void mainWindowImpl::breakButtonClicked() {
else { else {
blinkingStartButtonAnimationTimer->stop(); blinkingStartButtonAnimationTimer->stop();
//Set default Color //Set default Color
QPalette tempPalette = pushButton_break->palette(); pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
tempPalette.setColor(QPalette::Button, QColor(40,82,0));
tempPalette.setColor(QPalette::ButtonText, QColor(240,240,240));
pushButton_break->setPalette(tempPalette);
QFontMetrics tempMetrics = this->fontMetrics(); QFontMetrics tempMetrics = this->fontMetrics();
int width = tempMetrics.width(tr("Stop")); int width = tempMetrics.width(tr("Stop"));
pushButton_break->setMinimumSize(width+10,20); pushButton_break->setMinimumSize(width+10,20);