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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
doitux
2012-12-22 01:22:40 +01:00
parent f07c6f1333 838e91576b
commit 92d71f5c0d
8 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/localhand.cpp
+3 -3
View File
@@ -490,7 +490,7 @@ void LocalHand::setBlinds()
(*it_c)->setMySet((*it_c)->getMyCash());
// 1 to do not log this
(*it_c)->setMyAction(PLAYER_ACTION_ALLIN,1);
(*it_c)->setMyAction(PLAYER_ACTION_ALLIN);
} else {
(*it_c)->setMySet(smallBlind);
@@ -510,7 +510,7 @@ void LocalHand::setBlinds()
(*it_c)->setMySet((*it_c)->getMyCash());
// 1 to do not log this
(*it_c)->setMyAction(PLAYER_ACTION_ALLIN,1);
(*it_c)->setMyAction(PLAYER_ACTION_ALLIN);
} else {
(*it_c)->setMySet(2*smallBlind);
@@ -526,7 +526,7 @@ void LocalHand::switchRounds()
// logging last player action
PlayerListConstIterator previousPlayerIt = getRunningPlayerIt(previousPlayerID);
if(previousPlayerIt != runningPlayerList->end()) {
if(myLog) myLog->logPlayerAction((*previousPlayerIt)->getMyName(),myLog->transformPlayerActionLog((*previousPlayerIt)->getMyAction()),(*previousPlayerIt)->getMySet());
if(myLog) myLog->logPlayerAction((*previousPlayerIt)->getMyName(),myLog->transformPlayerActionLog((*previousPlayerIt)->getMyAction()),(*previousPlayerIt)->getMyLastRelativeSet());
}
PlayerListIterator it, it_1;
src/engine/local_engine/localplayer.cpp
+11 -21
View File
@@ -1068,7 +1068,7 @@ void LocalPlayer::action()
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setPreviousPlayerID(myID);
currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, mySet);
currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, myLastRelativeSet);
currentHand->getGuiInterface()->nextPlayerAnimation();
// cout << "playerID in action(): " << (*(currentHand->getCurrentBeRo()->getCurrentPlayersTurnIt()))->getMyID() << endl;
@@ -3230,14 +3230,12 @@ void LocalPlayer::evaluation(int bet, int raise)
case 3: {
// all in
if(highestSet >= myCash + mySet) {
mySet += myCash;
myCash = 0;
setMySet(myCash);
myAction = PLAYER_ACTION_ALLIN;
}
// sonst
else {
myCash = myCash - highestSet + mySet;
mySet = highestSet;
setMySet(highestSet-mySet);
}
}
break;
@@ -3250,16 +3248,14 @@ void LocalPlayer::evaluation(int bet, int raise)
currentHand->getCurrentBeRo()->setFullBetRule(true);
}
currentHand->getCurrentBeRo()->setMinimumRaise(myCash);
mySet = myCash;
myCash = 0;
setMySet(myCash);
myAction = PLAYER_ACTION_ALLIN;
highestSet = mySet;
}
// sonst
else {
currentHand->getCurrentBeRo()->setMinimumRaise(bet);
myCash = myCash - bet;
mySet = bet;
setMySet(bet);
highestSet = mySet;
}
@@ -3272,14 +3268,12 @@ void LocalPlayer::evaluation(int bet, int raise)
if(currentHand->getCurrentBeRo()->getFullBetRule()) { // full bet rule -> only call possible
// all in
if(highestSet >= myCash + mySet) {
mySet += myCash;
myCash = 0;
setMySet(myCash);
myAction = PLAYER_ACTION_ALLIN;
}
// sonst
else {
myCash = myCash - highestSet + mySet;
mySet = highestSet;
setMySet(highestSet-mySet);
myAction = PLAYER_ACTION_CALL;
}
} else {
@@ -3292,8 +3286,7 @@ void LocalPlayer::evaluation(int bet, int raise)
// perhaps full bet rule
if(highestSet >= myCash + mySet) {
// only call all-in
mySet += myCash;
myCash = 0;
setMySet(myCash);
myAction = PLAYER_ACTION_ALLIN;
} else {
// raise, but not enough --> full bet rule
@@ -3301,9 +3294,8 @@ void LocalPlayer::evaluation(int bet, int raise)
// lastPlayerAction für Karten umblättern reihenfolge setzrn
currentHand->setLastActionPlayerID(myUniqueID);
mySet += myCash;
setMySet(myCash);
currentHand->getCurrentBeRo()->setMinimumRaise(mySet-highestSet);
myCash = 0;
myAction = PLAYER_ACTION_ALLIN;
highestSet = mySet;
}
@@ -3311,9 +3303,8 @@ void LocalPlayer::evaluation(int bet, int raise)
// lastPlayerAction für Karten umblättern reihenfolge setzrn
currentHand->setLastActionPlayerID(myUniqueID);
mySet += myCash;
setMySet(myCash);
currentHand->getCurrentBeRo()->setMinimumRaise(mySet-highestSet);
myCash = 0;
myAction = PLAYER_ACTION_ALLIN;
highestSet = mySet;
}
@@ -3321,8 +3312,7 @@ void LocalPlayer::evaluation(int bet, int raise)
// sonst
else {
currentHand->getCurrentBeRo()->setMinimumRaise(raise);
myCash = myCash + mySet - highestSet - raise;
mySet = highestSet + raise;
setMySet(highestSet+raise-mySet);
highestSet = mySet;
// lastPlayerAction für Karten umblättern reihenfolge setzrn
currentHand->setLastActionPlayerID(myUniqueID);
src/engine/local_engine/localplayer.h
+3 -3
View File
@@ -113,10 +113,10 @@ public:
return myLastRelativeSet;
}
void setMyAction(PlayerAction theValue, bool blind = 0) {
void setMyAction(PlayerAction theValue, bool human = 0) {
myAction = theValue;
// logging for human player
if(myAction && !blind) currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, mySet);
// logging for seat 0
if(myAction && human) currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, myLastRelativeSet);
}
PlayerAction getMyAction() const {
return myAction;
src/engine/network_engine/clientplayer.cpp
+1 -1
View File
@@ -195,7 +195,7 @@ ClientPlayer::getMyLastRelativeSet() const
}
void
ClientPlayer::setMyAction(PlayerAction theValue, bool /*blind*/)
ClientPlayer::setMyAction(PlayerAction theValue, bool /*human*/)
{
boost::recursive_mutex::scoped_lock lock(m_syncMutex);
myAction = theValue;
src/engine/network_engine/clientplayer.h
+1 -1
View File
@@ -64,7 +64,7 @@ public:
int getMySet() const;
int getMyLastRelativeSet() const;
void setMyAction(PlayerAction theValue, bool blind);
void setMyAction(PlayerAction theValue, bool human);
PlayerAction getMyAction() const;
void setMyButton(int theValue);
src/engine/playerinterface.h
+2 -2
View File
@@ -62,8 +62,8 @@ public:
virtual int getMySet() const =0;
virtual int getMyLastRelativeSet() const =0;
virtual void setMyAction(PlayerAction theValue, bool blind=0) =0;
virtual PlayerAction getMyAction() const =0;
virtual void setMyAction(PlayerAction theValue, bool human=0) =0;
virtual PlayerAction getMyAction() const =0;
virtual void setMyButton(int theValue) =0;
virtual int getMyButton() const =0;
src/gui/qt/gametable/gametableimpl.cpp
+8 -8
View File
@@ -1990,7 +1990,7 @@ void gameTableImpl::myFold()
boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
humanPlayer->setMyAction(PLAYER_ACTION_FOLD);
humanPlayer->setMyAction(PLAYER_ACTION_FOLD,true);
humanPlayer->setMyTurn(0);
//set that i was the last active player. need this for unhighlighting groupbox
@@ -2009,7 +2009,7 @@ void gameTableImpl::myCheck()
boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
humanPlayer->setMyTurn(0);
humanPlayer->setMyAction(PLAYER_ACTION_CHECK);
humanPlayer->setMyAction(PLAYER_ACTION_CHECK,true);
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setPreviousPlayerID(0);
@@ -2072,10 +2072,10 @@ void gameTableImpl::myCall()
humanPlayer->setMySet(humanPlayer->getMyCash());
humanPlayer->setMyCash(0);
humanPlayer->setMyAction(PLAYER_ACTION_ALLIN);
humanPlayer->setMyAction(PLAYER_ACTION_ALLIN,true);
} else {
humanPlayer->setMySet(tempHighestSet - humanPlayer->getMySet());
humanPlayer->setMyAction(PLAYER_ACTION_CALL);
humanPlayer->setMyAction(PLAYER_ACTION_CALL,true);
}
humanPlayer->setMyTurn(0);
@@ -2108,7 +2108,7 @@ void gameTableImpl::mySet()
humanPlayer->setMySet(humanPlayer->getMyCash());
humanPlayer->setMyCash(0);
humanPlayer->setMyAction(PLAYER_ACTION_ALLIN);
humanPlayer->setMyAction(PLAYER_ACTION_ALLIN,true);
// full bet rule
if(currentHand->getCurrentBeRo()->getHighestSet() + currentHand->getCurrentBeRo()->getMinimumRaise() > humanPlayer->getMySet()) {
@@ -2119,7 +2119,7 @@ void gameTableImpl::mySet()
if(myActionIsRaise) {
//do not if allIn
if(humanPlayer->getMyAction() != 6) {
humanPlayer->setMyAction(PLAYER_ACTION_RAISE);
humanPlayer->setMyAction(PLAYER_ACTION_RAISE,true);
}
myActionIsRaise = 0;
@@ -2129,7 +2129,7 @@ void gameTableImpl::mySet()
if(myActionIsBet) {
//do not if allIn
if(humanPlayer->getMyAction() != 6) {
humanPlayer->setMyAction(PLAYER_ACTION_BET);
humanPlayer->setMyAction(PLAYER_ACTION_BET,true);
}
myActionIsBet = 0;
@@ -2166,7 +2166,7 @@ void gameTableImpl::myAllIn()
humanPlayer->setMySet(humanPlayer->getMyCash());
humanPlayer->setMyCash(0);
humanPlayer->setMyAction(PLAYER_ACTION_ALLIN);
humanPlayer->setMyAction(PLAYER_ACTION_ALLIN,true);
// full bet rule
if(currentHand->getCurrentBeRo()->getHighestSet() + currentHand->getCurrentBeRo()->getMinimumRaise() > humanPlayer->getMySet()) {
src/gui/qt/gametable/log/guilog.h
+1 -1
View File
@@ -21,9 +21,9 @@
#include <fstream>
#include <iostream>
#include <sstream>
#include <sqlite3.h>
#include "configfile.h"
#include <sqlite3.h>
#include <QtCore>
#include <QtGui>