diff --git a/src/game.cpp b/src/game.cpp index d11b0344..996d83a0 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -254,13 +254,13 @@ boost::shared_ptr Game::getCurrentPlayer() void Game::raiseBlinds() { // cout << "timer minutes " << blindsTimer.elapsed().total_seconds()/60 << "\n"; -// cout << "gameData.raiseIntervallMode " << myGameData.raiseIntervallMode << "\n"; +// cout << "gameData.RaiseIntervalMode " << myGameData.RaiseIntervalMode << "\n"; // cout << "gameData.raiseMode " << myGameData.raiseMode << "\n"; // cout << "gameData.afterManualBlindsMode " << myGameData.afterManualBlindsMode << "\n"; bool raiseBlinds = false; - if (myGameData.raiseIntervallMode == RAISE_ON_HANDNUMBER) { + if (myGameData.raiseIntervalMode == RAISE_ON_HANDNUMBER) { if (lastHandBlindsRaised + myGameData.raiseSmallBlindEveryHandsValue <= actualHandID) { raiseBlinds = true; diff --git a/src/gamedata.h b/src/gamedata.h index 3ea9b282..cc40b615 100644 --- a/src/gamedata.h +++ b/src/gamedata.h @@ -30,7 +30,7 @@ enum GameMode GAME_MODE_CLOSED }; -enum RaiseIntervallMode +enum RaiseIntervalMode { RAISE_ON_HANDNUMBER, RAISE_ON_MINUTES @@ -52,12 +52,12 @@ enum AfterManualBlindsMode // For the sake of simplicity, this is a struct. struct GameData { - GameData() : maxNumberOfPlayers(0), startMoney(0), smallBlind(0), firstSmallBlind(0), raiseIntervallMode(RAISE_ON_HANDNUMBER), raiseSmallBlindEveryHandsValue(8), raiseSmallBlindEveryMinutesValue(0), raiseMode(DOUBLE_BLINDS), afterManualBlindsMode(AFTERMB_DOUBLE_BLINDS), afterMBAlwaysRaiseValue(0), handsBeforeRaise(1), guiSpeed(4), playerActionTimeoutSec(20) {} + GameData() : maxNumberOfPlayers(0), startMoney(0), smallBlind(0), firstSmallBlind(0), raiseIntervalMode(RAISE_ON_HANDNUMBER), raiseSmallBlindEveryHandsValue(8), raiseSmallBlindEveryMinutesValue(0), raiseMode(DOUBLE_BLINDS), afterManualBlindsMode(AFTERMB_DOUBLE_BLINDS), afterMBAlwaysRaiseValue(0), handsBeforeRaise(1), guiSpeed(4), playerActionTimeoutSec(20) {} int maxNumberOfPlayers; int startMoney; int smallBlind; int firstSmallBlind; - RaiseIntervallMode raiseIntervallMode; + RaiseIntervalMode raiseIntervalMode; int raiseSmallBlindEveryHandsValue; int raiseSmallBlindEveryMinutesValue; RaiseMode raiseMode; diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index cabbf836..2bb218f1 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -82,12 +82,12 @@ void gameLobbyDialogImpl::createGame() gameData.firstSmallBlind = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); if(myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) { - gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; + gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER; gameData.raiseSmallBlindEveryHandsValue = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); gameData.handsBeforeRaise = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove } else { - gameData.raiseIntervallMode = RAISE_ON_MINUTES; + gameData.raiseIntervalMode = RAISE_ON_MINUTES; gameData.raiseSmallBlindEveryMinutesValue = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 9976ebca..fc6ed25a 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -725,12 +725,12 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) { gameData.firstSmallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); if(v->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) { - gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; + gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER; gameData.raiseSmallBlindEveryHandsValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); gameData.handsBeforeRaise = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove } else { - gameData.raiseIntervallMode = RAISE_ON_MINUTES; + gameData.raiseIntervalMode = RAISE_ON_MINUTES; gameData.raiseSmallBlindEveryMinutesValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); } @@ -771,12 +771,12 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) { gameData.firstSmallBlind = myConfig->readConfigInt("FirstSmallBlind"); if(myConfig->readConfigInt("RaiseBlindsAtHands")) { - gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; + gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER; gameData.raiseSmallBlindEveryHandsValue = myConfig->readConfigInt("RaiseSmallBlindEveryHands"); gameData.handsBeforeRaise = myConfig->readConfigInt("RaiseSmallBlindEveryHands"); //TODO remove } else { - gameData.raiseIntervallMode = RAISE_ON_MINUTES; + gameData.raiseIntervalMode = RAISE_ON_MINUTES; gameData.raiseSmallBlindEveryMinutesValue = myConfig->readConfigInt("RaiseSmallBlindEveryMinutes"); } @@ -846,12 +846,12 @@ void mainWindowImpl::callCreateNetworkGameDialog() { gameData.firstSmallBlind = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); if(myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) { - gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; + gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER; gameData.raiseSmallBlindEveryHandsValue = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); gameData.handsBeforeRaise = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove } else { - gameData.raiseIntervallMode = RAISE_ON_MINUTES; + gameData.raiseIntervalMode = RAISE_ON_MINUTES; gameData.raiseSmallBlindEveryMinutesValue = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); } diff --git a/src/gui/qt/mainwindow/mycardspixmaplabel.cpp b/src/gui/qt/mainwindow/mycardspixmaplabel.cpp index 7ec79e7d..d867dcef 100644 --- a/src/gui/qt/mainwindow/mycardspixmaplabel.cpp +++ b/src/gui/qt/mainwindow/mycardspixmaplabel.cpp @@ -51,9 +51,9 @@ void MyCardsPixmapLabel::startFadeOut(int speed) { frameOpacity = 0.0; - if(speed <= 4) { opacityRaiseIntervall = 0.01; } - if(speed > 4 && speed <= 7) { opacityRaiseIntervall = 0.02; } - if(speed > 7 && speed <= 10) { opacityRaiseIntervall = 0.04; } + if(speed <= 4) { opacityRaiseInterval = 0.01; } + if(speed > 4 && speed <= 7) { opacityRaiseInterval = 0.02; } + if(speed > 7 && speed <= 10) { opacityRaiseInterval = 0.04; } if(speed != 11) { fadeOutAction = TRUE; @@ -67,7 +67,7 @@ void MyCardsPixmapLabel::startFadeOut(int speed) { void MyCardsPixmapLabel::nextFadeOutFrame() { if (frameOpacity < 0.75) { - frameOpacity += opacityRaiseIntervall; + frameOpacity += opacityRaiseInterval; update(); } else { diff --git a/src/gui/qt/mainwindow/mycardspixmaplabel.h b/src/gui/qt/mainwindow/mycardspixmaplabel.h index 1be94458..88c70b3f 100644 --- a/src/gui/qt/mainwindow/mycardspixmaplabel.h +++ b/src/gui/qt/mainwindow/mycardspixmaplabel.h @@ -68,7 +68,7 @@ private: mainWindowImpl* myW; qreal frameOpacity; - qreal opacityRaiseIntervall; + qreal opacityRaiseInterval; qreal flipCardsScaleIntervall; qreal frameFlipCardsAction1Size;