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

sqlite-log: deleting unused parameters and implementing logging board cards

Browse Source
This commit is contained in:
floty
2011-02-27 16:34:39 +00:00
parent 22718fad46
commit 9c2dc64fbd
15 changed files with 72 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/localbero.cpp
+2 -1
View File
@@ -141,18 +141,19 @@ void LocalBeRo::run()
switch(myBeRoID) {
case GAME_STATE_FLOP:
myHand->getGuiInterface()->logDealBoardCardsMsg(myBeRoID, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2]);
myHand->getLog()->logBoardCards(myBeRoID, tempBoardCardsArray);
break;
case GAME_STATE_TURN:
myHand->getGuiInterface()->logDealBoardCardsMsg(myBeRoID, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3]);
break;
case GAME_STATE_RIVER:
myHand->getGuiInterface()->logDealBoardCardsMsg(myBeRoID, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]);
break;
default: {
LOG_ERROR(__FILE__ << " (" << __LINE__ << "): ERROR - wrong myBeRoID");
}
}
myHand->getLog()->logBoardCards(myBeRoID+1, tempBoardCardsArray);
logBoardCardsDone = true;
}
src/engine/local_engine/localplayer.cpp
+1 -1
View File
@@ -1073,7 +1073,7 @@ void LocalPlayer::action()
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(myID);
currentHand->getGuiInterface()->logPlayerActionMsg(myName, myID, myAction, mySet);
currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, mySet);
currentHand->getGuiInterface()->nextPlayerAnimation();
// cout << "playerID in action(): " << (*(currentHand->getCurrentBeRo()->getCurrentPlayersTurnIt()))->getMyID() << endl;
src/engine/local_engine/localplayer.h
+4 -4
View File
@@ -106,7 +106,7 @@ public:
void setMyAction(int theValue, bool blind = 0) {
myAction = theValue;
// logging for human player
if(myAction && !blind) currentHand->getGuiInterface()->logPlayerActionMsg(myName, myID, myAction, mySet);
if(myAction && !blind) currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, mySet);
}
int getMyAction() const {
return myAction;
@@ -155,13 +155,13 @@ public:
if(myCardsFlip) {
switch(state) {
case 1:
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myID, myCards[0], myCards[1], myCardsValueInt);
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt);
break;
case 2:
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myID, myCards[0], myCards[1]);
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]);
break;
case 3:
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myID, myCards[0], myCards[1], myCardsValueInt, "has");
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has");
break;
default:
;
src/engine/log.cpp
+38 -62
View File
@@ -262,72 +262,12 @@ void Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, uns
}
logPlayerAction(0,dealerPosition+1,LOG_ACTION_DEALER);
// // Action 'starts as dealer'
// sql = "INSERT INTO Action (";
// sql += "HandID";
// sql += ",GameID";
// sql += ",BeRo";
// sql += ",Player";
// sql += ",Action";
// sql += ",Amount";
// sql += ") VALUES (";
// sql += boost::lexical_cast<string>(curHandID);
// sql += "," + boost::lexical_cast<string>(curGameID);
// sql += ",0";
// sql += "," + boost::lexical_cast<string>(dealerPosition+1);
// sql += ",'starts as dealer'";
// sql += ",NULL";
// sql += ")";
// if(sqlite3_exec(mySqliteLogDb, sql.data(), 0, 0, &errmsg) != SQLITE_OK) {
// cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl;
// }
// // Action 'posts small blind'
// sql = "INSERT INTO Action (";
// sql += "HandID";
// sql += ",GameID";
// sql += ",BeRo";
// sql += ",Player";
// sql += ",Action";
// sql += ",Amount";
// sql += ") VALUES (";
// sql += boost::lexical_cast<string>(curHandID);
// sql += "," + boost::lexical_cast<string>(curGameID);
// sql += ",0";
// sql += "," + boost::lexical_cast<string>(smallBlindPosition+1);
// sql += ",'posts small blind'";
// sql += "," + boost::lexical_cast<string>(smallBlind);
// sql += ")";
// if(sqlite3_exec(mySqliteLogDb, sql.data(), 0, 0, &errmsg) != SQLITE_OK) {
// cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl;
// }
// // Action 'posts big blind'
// sql = "INSERT INTO Action (";
// sql += "HandID";
// sql += ",GameID";
// sql += ",BeRo";
// sql += ",Player";
// sql += ",Action";
// sql += ",Amount";
// sql += ") VALUES (";
// sql += boost::lexical_cast<string>(curHandID);
// sql += "," + boost::lexical_cast<string>(curGameID);
// sql += ",0";
// sql += "," + boost::lexical_cast<string>(bigBlindPosition+1);
// sql += ",\'posts big blind'";
// sql += "," + boost::lexical_cast<string>(bigBlind);
// sql += ")";
// if(sqlite3_exec(mySqliteLogDb, sql.data(), 0, 0, &errmsg) != SQLITE_OK) {
// cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl;
// }
}
}
}
}
void Log::logPlayerAction(int bero, int seat, int action, int amount)
void Log::logPlayerAction(int bero, int seat, PlayerActionLog action, int amount)
{
if(SQLITE_LOG) {
@@ -413,10 +353,46 @@ void Log::logPlayerAction(int bero, int seat, int action, int amount)
}
}
void Log::logBoardCards(GameState beroID, int boardCards[5])
void Log::logBoardCards(int bero, int boardCards[5])
{
if(SQLITE_LOG) {
if(logOnOff) {
//if write logfiles is enabled
string sql;
char *errmsg;
if( mySqliteLogDb != 0 ) {
// sqlite-db is open
sql = "UPDATE Hand SET ";
switch(bero) {
case 2: {
sql += "BoardCard_1=" + boost::lexical_cast<string>(boardCards[0]) + ",";
sql += "BoardCard_2=" + boost::lexical_cast<string>(boardCards[1]) + ",";
sql += "BoardCard_3=" + boost::lexical_cast<string>(boardCards[2]);
}
break;
case 3: {
sql += "BoardCard_4=" + boost::lexical_cast<string>(boardCards[3]);
}
break;
case 4: {
sql += "BoardCard_5=" + boost::lexical_cast<string>(boardCards[4]);
}
break;
default:
return;
}
sql += " WHERE ";
sql += "GameID=" + boost::lexical_cast<string>(curGameID) + " AND ";
sql += "HandID=" + boost::lexical_cast<string>(curHandID);
if(sqlite3_exec(mySqliteLogDb, sql.data(), 0, 0, &errmsg) != SQLITE_OK) {
cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl;
}
}
}
}
}
src/engine/log.h
+2 -2
View File
@@ -34,8 +34,8 @@ public:
void logNewGameMsg(int gameID, int startCash, int startSmallBlind, unsigned dealerPosition, PlayerList seatsList);
void logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, unsigned smallBlindPosition, int bigBlind, unsigned bigBlindPosition, PlayerList seatsList);
void logPlayerAction(int bero, int seat, int action, int amount = 0);
void logBoardCards(GameState beroID, int boardCards[5]);
void logPlayerAction(int bero, int seat, PlayerActionLog action, int amount = 0);
void logBoardCards(int bero, int boardCards[5]);
// void closeLogDbAtExit();
src/engine/network_engine/clientplayer.cpp
+3 -3
View File
@@ -267,13 +267,13 @@ ClientPlayer::setMyCardsFlip(bool theValue, int state)
if (myCardsFlip) {
switch(state) {
case 1:
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myID, myCards[0], myCards[1], myCardsValueInt);
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt);
break;
case 2:
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myID, myCards[0], myCards[1]);
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]);
break;
case 3:
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myID, myCards[0], myCards[1], myCardsValueInt, "has");
currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has");
break;
default:
;
src/gui/generic/serverguiwrapper.cpp
+2 -2
View File
@@ -105,14 +105,14 @@ void ServerGuiWrapper::changeVoteOnKickButtonsState(bool /*showHide*/) {}
void ServerGuiWrapper::refreshVotesMonitor(int /*currentVotes*/, int /*numVotesNeededToKick*/) {}
void ServerGuiWrapper::endVoteOnKick() {}
void ServerGuiWrapper::logPlayerActionMsg(string /*playerName*/, int /*playerID*/, int /*action*/, int /*setValue*/) {}
void ServerGuiWrapper::logPlayerActionMsg(string /*playerName*/, int /*action*/, int /*setValue*/) {}
void ServerGuiWrapper::logNewGameHandMsg(int /*gameID*/, int /*handID*/) {}
void ServerGuiWrapper::logPlayerWinsMsg(std::string /*playerName*/, int /*pot*/, bool /*main*/) {}
void ServerGuiWrapper::logPlayerSitsOut(std::string /*playerName*/) {}
void ServerGuiWrapper::logNewBlindsSetsMsg(int /*sbSet*/, int /*bbSet*/, std::string /*sbName*/, std::string /*bbName*/) {}
void ServerGuiWrapper::logDealBoardCardsMsg(int /*roundID*/, int /*card1*/, int /*card2*/, int /*card3*/, int /*card4*/, int /*card5*/) {}
void ServerGuiWrapper::logFlipHoleCardsMsg(std::string /*playerName*/, int /*playerID*/, int /*card1*/, int /*card2*/, int /*cardsValueInt*/, std::string /*showHas*/) {}
void ServerGuiWrapper::logFlipHoleCardsMsg(std::string /*playerName*/, int /*card1*/, int /*card2*/, int /*cardsValueInt*/, std::string /*showHas*/) {}
void ServerGuiWrapper::logPlayerWinGame(std::string /*playerName*/, int /*gameID*/) {}
void ServerGuiWrapper::flushLogAtGame(int /*gameID*/) {}
void ServerGuiWrapper::flushLogAtHand() {}
src/gui/generic/serverguiwrapper.h
+2 -2
View File
@@ -98,13 +98,13 @@ public:
void refreshVotesMonitor(int currentVotes, int numVotesNeededToKick);
void endVoteOnKick();
void logPlayerActionMsg(std::string playerName, int playerID, int action, int setValue) ;
void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
void logNewGameHandMsg(int gameID, int handID) ;
void logPlayerWinsMsg(std::string playerName, int pot, bool main);
void logPlayerSitsOut(std::string playerName);
void logNewBlindsSetsMsg(int sbSet, int bbSet, std::string sbName, std::string bbName);
void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1) ;
void logFlipHoleCardsMsg(std::string playerName, int playerID, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows") ;
void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows") ;
void logPlayerWinGame(std::string playerName, int gameID);
void flushLogAtGame(int gameID);
void flushLogAtHand();
src/gui/guiinterface.h
+2 -2
View File
@@ -100,13 +100,13 @@ public:
virtual void endVoteOnKick() =0;
//log.cpp
virtual void logPlayerActionMsg(std::string playName, int playerID, int action, int setValue) =0;
virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
virtual void logNewGameHandMsg(int gameID, int HandID) =0;
virtual void logPlayerWinsMsg(std::string playerName, int pot, bool main) = 0;
virtual void logPlayerSitsOut(std::string playerName) = 0;
virtual void logNewBlindsSetsMsg(int sbSet, int bbSet, std::string sbName, std::string bbName) =0;
virtual void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1) = 0;
virtual void logFlipHoleCardsMsg(std::string playerName, int playerID, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows") = 0;
virtual void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows") = 0;
virtual void logPlayerWinGame(std::string playerName, int gameID) =0;
virtual void flushLogAtGame(int gameID) =0;
virtual void flushLogAtHand() =0;
src/gui/qt/gametable/gametableimpl.cpp
+2
View File
@@ -2476,6 +2476,7 @@ void gameTableImpl::postRiverRunAnimation3()
// if (textLabel_handLabel->text() == "River") {
//set Player value (logging)
currentHand->getLog()->logPlayerAction(5,(*it_c)->getMyID()+1,LOG_ACTION_WIN,pot);
(*it_c)->setMyWinnerState(true, pot);
// }
@@ -2502,6 +2503,7 @@ void gameTableImpl::postRiverRunAnimation3()
for(it_int = winners.begin(); it_int != winners.end(); ++it_int) {
if((*it_int) == (*it_c)->getMyUniqueID()) {
int pot = (*it_c)->getLastMoneyWon();
currentHand->getLog()->logPlayerAction(5,(*it_c)->getMyID()+1,LOG_ACTION_WIN_SIDE_POT,pot);
(*it_c)->setMyWinnerState(false, pot);
}
}
src/gui/qt/gametable/log/guilog.cpp
+4 -4
View File
@@ -36,13 +36,13 @@ guiLog::guiLog(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(
myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
connect(this, SIGNAL(signalLogPlayerActionMsg(QString, int, int, int)), this, SLOT(logPlayerActionMsg(QString, int, int, int)));
connect(this, SIGNAL(signalLogPlayerActionMsg(QString, int, int)), this, SLOT(logPlayerActionMsg(QString, int, int)));
connect(this, SIGNAL(signalLogNewGameHandMsg(int, int)), this, SLOT(logNewGameHandMsg(int, int)));
connect(this, SIGNAL(signalLogNewBlindsSetsMsg(int, int, QString, QString)), this, SLOT(logNewBlindsSetsMsg(int, int, QString, QString)));
connect(this, SIGNAL(signalLogPlayerWinsMsg(QString, int, bool)), this, SLOT(logPlayerWinsMsg(QString, int, bool)));
connect(this, SIGNAL(signalLogPlayerSitsOut(QString)), this, SLOT(logPlayerSitsOut(QString)));
connect(this, SIGNAL(signalLogDealBoardCardsMsg(int, int, int, int, int, int)), this, SLOT(logDealBoardCardsMsg(int, int, int, int, int, int)));
connect(this, SIGNAL(signalLogFlipHoleCardsMsg(QString, int, int, int, int, QString)), this, SLOT(logFlipHoleCardsMsg(QString, int, int, int, int, QString)));
connect(this, SIGNAL(signalLogFlipHoleCardsMsg(QString, int, int, int, QString)), this, SLOT(logFlipHoleCardsMsg(QString, int, int, int, QString)));
connect(this, SIGNAL(signalLogPlayerLeftMsg(QString, int)), this, SLOT(logPlayerLeftMsg(QString, int)));
connect(this, SIGNAL(signalLogNewGameAdminMsg(QString)), this, SLOT(logNewGameAdminMsg(QString)));
connect(this, SIGNAL(signalLogPlayerWinGame(QString, int)), this, SLOT(logPlayerWinGame(QString, int)));
@@ -129,7 +129,7 @@ guiLog::~guiLog()
}
void guiLog::logPlayerActionMsg(QString msg, int playerID, int action, int setValue)
void guiLog::logPlayerActionMsg(QString msg, int action, int setValue)
{
switch (action) {
@@ -580,7 +580,7 @@ void guiLog::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3,
}
}
void guiLog::logFlipHoleCardsMsg(QString playerName, int playerID, int card1, int card2, int cardsValueInt, QString showHas)
void guiLog::logFlipHoleCardsMsg(QString playerName, int card1, int card2, int cardsValueInt, QString showHas)
{
QString tempHandName;
src/gui/qt/gametable/log/guilog.h
+4 -4
View File
@@ -44,13 +44,13 @@ public:
public slots:
void logPlayerActionMsg(QString playerName, int playerID, int action, int setValue);
void logPlayerActionMsg(QString playerName, int action, int setValue);
void logNewGameHandMsg(int gameID, int handID);
void logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString bbName);
void logPlayerWinsMsg(QString playerName, int pot, bool main);
void logPlayerSitsOut(QString playerName);
void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1);
void logFlipHoleCardsMsg(QString playerName, int playerID, int card1, int card2, int cardsValueInt = -1, QString showHas = "shows");
void logFlipHoleCardsMsg(QString playerName, int card1, int card2, int cardsValueInt = -1, QString showHas = "shows");
void logPlayerLeftMsg(QString playerName, int wasKicked);
void logNewGameAdminMsg(QString playerName);
void logPlayerWinGame(QString playerName, int gameID);
@@ -66,13 +66,13 @@ public:
void writeLogFileStream(QString string);
signals:
void signalLogPlayerActionMsg(QString playerName, int playerID, int action, int setValue);
void signalLogPlayerActionMsg(QString playerName, int action, int setValue);
void signalLogNewGameHandMsg(int gameID, int handID);
void signalLogNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString bbName);
void signalLogPlayerWinsMsg(QString playerName, int pot, bool main);
void signalLogPlayerSitsOut(QString playerName);
void signalLogDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1);
void signalLogFlipHoleCardsMsg(QString playerName, int playerID, int card1, int card2, int cardsValueInt = -1, QString showHas = "shows");
void signalLogFlipHoleCardsMsg(QString playerName, int card1, int card2, int cardsValueInt = -1, QString showHas = "shows");
void signalLogPlayerLeftMsg(QString playerName, int wasKicked);
void signalLogNewGameAdminMsg(QString playerName);
void signalLogPlayerWinGame(QString playerName, int gameID);
src/gui/qt/guiwrapper.cpp
+4 -4
View File
@@ -239,9 +239,9 @@ void GuiWrapper::endVoteOnKick()
myW->signalEndVoteOnKick();
}
void GuiWrapper::logPlayerActionMsg(string playerName, int playerID, int action, int setValue)
void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue)
{
myGuiLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), playerID, action, setValue);
myGuiLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), action, setValue);
}
void GuiWrapper::logNewGameHandMsg(int gameID, int handID)
{
@@ -263,9 +263,9 @@ void GuiWrapper::logDealBoardCardsMsg(int roundID, int card1, int card2, int car
{
myGuiLog->signalLogDealBoardCardsMsg(roundID, card1, card2, card3, card4, card5);
}
void GuiWrapper::logFlipHoleCardsMsg(string playerName, int playerID, int card1, int card2, int cardsValueInt, string showHas)
void GuiWrapper::logFlipHoleCardsMsg(string playerName, int card1, int card2, int cardsValueInt, string showHas)
{
myGuiLog->signalLogFlipHoleCardsMsg(QString::fromUtf8(playerName.c_str()), playerID, card1, card2, cardsValueInt, QString::fromUtf8(showHas.c_str()));
myGuiLog->signalLogFlipHoleCardsMsg(QString::fromUtf8(playerName.c_str()), card1, card2, cardsValueInt, QString::fromUtf8(showHas.c_str()));
}
void GuiWrapper::logPlayerWinGame(std::string playerName, int gameID)
{
src/gui/qt/guiwrapper.h
+2 -2
View File
@@ -105,13 +105,13 @@ public:
void refreshVotesMonitor(int currentVotes, int numVotesNeededToKick);
void endVoteOnKick();
void logPlayerActionMsg(std::string playerName, int playerID, int action, int setValue) ;
void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
void logNewGameHandMsg(int gameID, int handID) ;
void logNewBlindsSetsMsg(int sbSet, int bbSet, std::string sbName, std::string bbName);
void logPlayerWinsMsg(std::string playerName, int pot, bool main);
void logPlayerSitsOut(std::string playerName);
void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1);
void logFlipHoleCardsMsg(std::string playerName, int playerID, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows");
void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows");
void logPlayerWinGame(std::string playerName, int gameID);
void flushLogAtGame(int gameID);
void flushLogAtHand();
src/net/common/clientstate.cpp
-1
View File
@@ -1687,7 +1687,6 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
assert(netActionDone->totalPlayerBet >= (long)tmpPlayer->getMySet());
client->GetGui().logPlayerActionMsg(
tmpPlayer->getMyName(),
tmpPlayer->getMyID(),
netActionDone->playerAction,
netActionDone->totalPlayerBet - tmpPlayer->getMySet());
}