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

Name fix.

Browse Source
This commit is contained in:
lotodore
2007-09-29 19:23:14 +00:00
parent e800a83193
commit 43103d6fea
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game.cpp
+2 -2
View File
@@ -254,13 +254,13 @@ boost::shared_ptr<PlayerInterface> Game::getCurrentPlayer()
void Game::raiseBlinds() { void Game::raiseBlinds() {
// cout << "timer minutes " << blindsTimer.elapsed().total_seconds()/60 << "\n"; // 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.raiseMode " << myGameData.raiseMode << "\n";
// cout << "gameData.afterManualBlindsMode " << myGameData.afterManualBlindsMode << "\n"; // cout << "gameData.afterManualBlindsMode " << myGameData.afterManualBlindsMode << "\n";
bool raiseBlinds = false; bool raiseBlinds = false;
if (myGameData.raiseIntervallMode == RAISE_ON_HANDNUMBER) { if (myGameData.raiseIntervalMode == RAISE_ON_HANDNUMBER) {
if (lastHandBlindsRaised + myGameData.raiseSmallBlindEveryHandsValue <= actualHandID) { if (lastHandBlindsRaised + myGameData.raiseSmallBlindEveryHandsValue <= actualHandID) {
raiseBlinds = true; raiseBlinds = true;
src/gamedata.h
+3 -3
View File
@@ -30,7 +30,7 @@ enum GameMode
GAME_MODE_CLOSED GAME_MODE_CLOSED
}; };
enum RaiseIntervallMode enum RaiseIntervalMode
{ {
RAISE_ON_HANDNUMBER, RAISE_ON_HANDNUMBER,
RAISE_ON_MINUTES RAISE_ON_MINUTES
@@ -52,12 +52,12 @@ enum AfterManualBlindsMode
// For the sake of simplicity, this is a struct. // For the sake of simplicity, this is a struct.
struct GameData 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 maxNumberOfPlayers;
int startMoney; int startMoney;
int smallBlind; int smallBlind;
int firstSmallBlind; int firstSmallBlind;
RaiseIntervallMode raiseIntervallMode; RaiseIntervalMode raiseIntervalMode;
int raiseSmallBlindEveryHandsValue; int raiseSmallBlindEveryHandsValue;
int raiseSmallBlindEveryMinutesValue; int raiseSmallBlindEveryMinutesValue;
RaiseMode raiseMode; RaiseMode raiseMode;
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+2 -2
View File
@@ -82,12 +82,12 @@ void gameLobbyDialogImpl::createGame()
gameData.firstSmallBlind = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); gameData.firstSmallBlind = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value();
if(myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) { if(myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) {
gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER;
gameData.raiseSmallBlindEveryHandsValue = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); gameData.raiseSmallBlindEveryHandsValue = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value();
gameData.handsBeforeRaise = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove gameData.handsBeforeRaise = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove
} }
else { else {
gameData.raiseIntervallMode = RAISE_ON_MINUTES; gameData.raiseIntervalMode = RAISE_ON_MINUTES;
gameData.raiseSmallBlindEveryMinutesValue = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); gameData.raiseSmallBlindEveryMinutesValue = myCreateInternetGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value();
} }
src/gui/qt/mainwindow/mainwindowimpl.cpp
+6 -6
View File
@@ -725,12 +725,12 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
gameData.firstSmallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); gameData.firstSmallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value();
if(v->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) { if(v->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) {
gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER;
gameData.raiseSmallBlindEveryHandsValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); gameData.raiseSmallBlindEveryHandsValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value();
gameData.handsBeforeRaise = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove gameData.handsBeforeRaise = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove
} }
else { else {
gameData.raiseIntervallMode = RAISE_ON_MINUTES; gameData.raiseIntervalMode = RAISE_ON_MINUTES;
gameData.raiseSmallBlindEveryMinutesValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); gameData.raiseSmallBlindEveryMinutesValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value();
} }
@@ -771,12 +771,12 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
gameData.firstSmallBlind = myConfig->readConfigInt("FirstSmallBlind"); gameData.firstSmallBlind = myConfig->readConfigInt("FirstSmallBlind");
if(myConfig->readConfigInt("RaiseBlindsAtHands")) { if(myConfig->readConfigInt("RaiseBlindsAtHands")) {
gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER;
gameData.raiseSmallBlindEveryHandsValue = myConfig->readConfigInt("RaiseSmallBlindEveryHands"); gameData.raiseSmallBlindEveryHandsValue = myConfig->readConfigInt("RaiseSmallBlindEveryHands");
gameData.handsBeforeRaise = myConfig->readConfigInt("RaiseSmallBlindEveryHands"); //TODO remove gameData.handsBeforeRaise = myConfig->readConfigInt("RaiseSmallBlindEveryHands"); //TODO remove
} }
else { else {
gameData.raiseIntervallMode = RAISE_ON_MINUTES; gameData.raiseIntervalMode = RAISE_ON_MINUTES;
gameData.raiseSmallBlindEveryMinutesValue = myConfig->readConfigInt("RaiseSmallBlindEveryMinutes"); gameData.raiseSmallBlindEveryMinutesValue = myConfig->readConfigInt("RaiseSmallBlindEveryMinutes");
} }
@@ -846,12 +846,12 @@ void mainWindowImpl::callCreateNetworkGameDialog() {
gameData.firstSmallBlind = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value(); gameData.firstSmallBlind = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value();
if(myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) { if(myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) {
gameData.raiseIntervallMode = RAISE_ON_HANDNUMBER; gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER;
gameData.raiseSmallBlindEveryHandsValue = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); gameData.raiseSmallBlindEveryHandsValue = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value();
gameData.handsBeforeRaise = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove gameData.handsBeforeRaise = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value(); //TODO remove
} }
else { else {
gameData.raiseIntervallMode = RAISE_ON_MINUTES; gameData.raiseIntervalMode = RAISE_ON_MINUTES;
gameData.raiseSmallBlindEveryMinutesValue = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value(); gameData.raiseSmallBlindEveryMinutesValue = myCreateNetworkGameDialog->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value();
} }
src/gui/qt/mainwindow/mycardspixmaplabel.cpp
+4 -4
View File
@@ -51,9 +51,9 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
frameOpacity = 0.0; frameOpacity = 0.0;
if(speed <= 4) { opacityRaiseIntervall = 0.01; } if(speed <= 4) { opacityRaiseInterval = 0.01; }
if(speed > 4 && speed <= 7) { opacityRaiseIntervall = 0.02; } if(speed > 4 && speed <= 7) { opacityRaiseInterval = 0.02; }
if(speed > 7 && speed <= 10) { opacityRaiseIntervall = 0.04; } if(speed > 7 && speed <= 10) { opacityRaiseInterval = 0.04; }
if(speed != 11) { if(speed != 11) {
fadeOutAction = TRUE; fadeOutAction = TRUE;
@@ -67,7 +67,7 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
void MyCardsPixmapLabel::nextFadeOutFrame() { void MyCardsPixmapLabel::nextFadeOutFrame() {
if (frameOpacity < 0.75) { if (frameOpacity < 0.75) {
frameOpacity += opacityRaiseIntervall; frameOpacity += opacityRaiseInterval;
update(); update();
} }
else { else {
src/gui/qt/mainwindow/mycardspixmaplabel.h
+1 -1
View File
@@ -68,7 +68,7 @@ private:
mainWindowImpl* myW; mainWindowImpl* myW;
qreal frameOpacity; qreal frameOpacity;
qreal opacityRaiseIntervall; qreal opacityRaiseInterval;
qreal flipCardsScaleIntervall; qreal flipCardsScaleIntervall;
qreal frameFlipCardsAction1Size; qreal frameFlipCardsAction1Size;