Name fix.
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -68,7 +68,7 @@ private:
|
||||
mainWindowImpl* myW;
|
||||
|
||||
qreal frameOpacity;
|
||||
qreal opacityRaiseIntervall;
|
||||
qreal opacityRaiseInterval;
|
||||
|
||||
qreal flipCardsScaleIntervall;
|
||||
qreal frameFlipCardsAction1Size;
|
||||
|
||||
Reference in New Issue
Block a user