diff --git a/pokerth_lib.pro b/pokerth_lib.pro index a1b76df6..cd67f52f 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -190,8 +190,8 @@ mac{ INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } -CONFIG += staticlib qt thread warn_on release -#CONFIG += staticlib qt thread warn_on debug +#CONFIG += staticlib qt thread warn_on release +CONFIG += staticlib qt thread warn_on debug UI_DIR = uics TARGET = lib/pokerth_lib MOC_DIR = mocs diff --git a/src/gamedata.h b/src/gamedata.h index eeadd962..3ea9b282 100644 --- a/src/gamedata.h +++ b/src/gamedata.h @@ -30,14 +30,40 @@ enum GameMode GAME_MODE_CLOSED }; +enum RaiseIntervallMode +{ + RAISE_ON_HANDNUMBER, + RAISE_ON_MINUTES +}; + +enum RaiseMode +{ + DOUBLE_BLINDS, + MANUAL_BLINDS_ORDER +}; + +enum AfterManualBlindsMode +{ + AFTERMB_DOUBLE_BLINDS, + AFTERMB_RAISE_ABOUT, + AFTERMB_STAY_AT_LAST_BLIND +}; + // For the sake of simplicity, this is a struct. struct GameData { - GameData() : maxNumberOfPlayers(0), startMoney(0), smallBlind(0), - handsBeforeRaise(1), guiSpeed(4), playerActionTimeoutSec(20) {} + 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) {} int maxNumberOfPlayers; int startMoney; int smallBlind; + int firstSmallBlind; + RaiseIntervallMode raiseIntervallMode; + int raiseSmallBlindEveryHandsValue; + int raiseSmallBlindEveryMinutesValue; + RaiseMode raiseMode; + std::list manualBlindsList; + AfterManualBlindsMode afterManualBlindsMode; + int afterMBAlwaysRaiseValue; int handsBeforeRaise; int guiSpeed; int playerActionTimeoutSec; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 66527fc1..56743595 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -717,8 +717,17 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) { // Set Game Data gameData.maxNumberOfPlayers = v->spinBox_quantityPlayers->value(); gameData.startMoney = v->spinBox_startCash->value(); - gameData.smallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); - gameData.handsBeforeRaise = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); + gameData.smallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); //TODO remove + gameData.firstSmallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); + if(v->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; + else gameData.raiseIntervallMode = RAISE_ON_MINUTES; + gameData.raiseSmallBlindEveryHandsValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); + gameData.handsBeforeRaise = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove + gameData.raiseSmallBlindEveryMinutesValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); + if(v->getChangeCompleteBlindsDialog()->radioButton_alwaysDoubleBlinds->isChecked()) gameData.raiseMode = DOUBLE_BLINDS; + else gameData.raiseMode = MANUAL_BLINDS_ORDER; + + //Speeds gameData.guiSpeed = v->spinBox_gameSpeed->value(); }