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

bugfix: allin-bug

Browse Source
This commit is contained in:
floty
2007-08-31 13:09:07 +00:00
parent a84f164b8a
commit a0e78485df
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+2 -2
View File
@@ -3,8 +3,8 @@
TEMPLATE = app TEMPLATE = app
CODECFORSRC = UTF-8 CODECFORSRC = UTF-8
CONFIG += qt thread embed_manifest_exe release #CONFIG += qt thread embed_manifest_exe release
#CONFIG += qt thread embed_manifest_exe warn_on debug CONFIG += qt thread embed_manifest_exe warn_on debug
UI_DIR = uics UI_DIR = uics
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
pokerth_lib.pro
+2 -2
View File
@@ -178,8 +178,8 @@ mac{
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
} }
CONFIG += staticlib qt thread release #CONFIG += staticlib qt thread release
#CONFIG += staticlib qt thread warn_on debug CONFIG += staticlib qt thread warn_on debug
UI_DIR = uics UI_DIR = uics
TARGET = lib/pokerth_lib TARGET = lib/pokerth_lib
MOC_DIR = mocs MOC_DIR = mocs
pokerth_server.pro
+2 -2
View File
@@ -128,8 +128,8 @@ unix:!mac{
#LIBS += -lcrypto #LIBS += -lcrypto
} }
CONFIG += qt thread console embed_manifest_exe release #CONFIG += qt thread console embed_manifest_exe release
#CONFIG += qt thread console embed_manifest_exe warn_on debug CONFIG += qt thread console embed_manifest_exe warn_on debug
UI_DIR = uics UI_DIR = uics
TARGET = bin/pokerth_server TARGET = bin/pokerth_server
MOC_DIR = mocs MOC_DIR = mocs
src/engine/local_engine/localbero.cpp
+7 -1
View File
@@ -63,6 +63,7 @@ void LocalBeRo::run() {
break; break;
case GAME_STATE_RIVER: myHand->getGuiInterface()->logDealBoardCardsMsg(myBeRoID, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]); case GAME_STATE_RIVER: myHand->getGuiInterface()->logDealBoardCardsMsg(myBeRoID, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]);
break; break;
default: { cout << "ERROR in localbero.cpp - wrong myBeRoID" << endl;}
} }
logBoardCardsDone = 1; logBoardCardsDone = 1;
@@ -107,7 +108,9 @@ void LocalBeRo::run() {
myHand->setBettingRoundsPlayed(myBeRoID); myHand->setBettingRoundsPlayed(myBeRoID);
} }
if( !(myHand->getActualQuantityPlayers() < 3 && firstHeadsUpRound == 1) ) { //// !!!!!!!!!!!!! very buggy, rule breaking -> TODO !!!!!!!!!!!!!!!! //////////////
if( !(myHand->getActualQuantityPlayers() < 3 && firstHeadsUpRound == 1) || myHand->getPlayerArray()[playersTurn]->getMyActiveStatus() == 0 ) {
// not first round in heads up (for headsup dealer is smallblind so it is dealers turn) // not first round in heads up (for headsup dealer is smallblind so it is dealers turn)
// naechsten Spieler ermitteln // naechsten Spieler ermitteln
@@ -115,9 +118,12 @@ void LocalBeRo::run() {
for(i=0; (i<MAX_NUMBER_OF_PLAYERS && !(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || (myHand->getPlayerArray()[playersTurn]->getMyAction())==1 || (myHand->getPlayerArray()[playersTurn]->getMyAction())==6) || i==0; i++) { for(i=0; (i<MAX_NUMBER_OF_PLAYERS && !(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || (myHand->getPlayerArray()[playersTurn]->getMyAction())==1 || (myHand->getPlayerArray()[playersTurn]->getMyAction())==6) || i==0; i++) {
playersTurn = (playersTurn+1)%(MAX_NUMBER_OF_PLAYERS); playersTurn = (playersTurn+1)%(MAX_NUMBER_OF_PLAYERS);
} }
firstHeadsUpRound = 0;
} }
else { firstHeadsUpRound = 0; } else { firstHeadsUpRound = 0; }
////// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ////////////////
//Spieler-Position vor SmallBlind-Position ermitteln //Spieler-Position vor SmallBlind-Position ermitteln
int activePlayerBeforeSmallBlind = smallBlindPosition; int activePlayerBeforeSmallBlind = smallBlindPosition;
src/engine/local_engine/localhand.cpp
-4
View File
@@ -37,7 +37,6 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardI
myBoard->setHand(this); myBoard->setHand(this);
for(i=0; i<startQuantityPlayers; i++) { for(i=0; i<startQuantityPlayers; i++) {
playerArray[i]->setHand(this); playerArray[i]->setHand(this);
// myFlipCards auf 0 setzen // myFlipCards auf 0 setzen
@@ -174,9 +173,6 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardI
// cout << i << ": " << playerArray[i]->getMyCardsValueInt() << endl; // cout << i << ": " << playerArray[i]->getMyCardsValueInt() << endl;
// } // }
dealerPosition = 2;
} }
} }
src/gui/qt/mainwindow/mainwindowimpl.cpp
+5 -2
View File
@@ -742,6 +742,9 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
int tmpDealerPos = 0; int tmpDealerPos = 0;
startData.numberOfPlayers = gameData.maxNumberOfPlayers; startData.numberOfPlayers = gameData.maxNumberOfPlayers;
Tools::getRandNumber(0, startData.numberOfPlayers-1, 1, &tmpDealerPos, 0); Tools::getRandNumber(0, startData.numberOfPlayers-1, 1, &tmpDealerPos, 0);
if(DEBUG_MODE) {
tmpDealerPos = 2;
}
startData.startDealerPlayerId = static_cast<unsigned>(tmpDealerPos); startData.startDealerPlayerId = static_cast<unsigned>(tmpDealerPos);
//some gui modifications //some gui modifications
@@ -1407,7 +1410,7 @@ void mainWindowImpl::dealBeRoCards(int myBeRoID) {
break; break;
case 3: { dealRiverCards0(); } case 3: { dealRiverCards0(); }
break; break;
default: { cout << "dealBeRoCards Error" << endl; } default: { cout << "dealBeRoCards() Error" << endl; }
} }
} }
@@ -1897,7 +1900,7 @@ void mainWindowImpl::beRoAnimation2(int myBeRoID) {
break; break;
case 3: { riverAnimation2(); } case 3: { riverAnimation2(); }
break; break;
default: { cout << "beRoAnimation2 Error" << endl; } default: { cout << "beRoAnimation2() Error" << endl; }
} }
} }