From 20028cb07f7d19f902c22779948e42b5f1bd7dc1 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 1 Aug 2010 15:21:31 +0000 Subject: [PATCH] Store date/time when the game ends. --- chatcleaner.pro | 27 ++++++++++++--------------- src/net/common/servergame.cpp | 2 -- src/net/common/servergamestate.cpp | 5 ++++- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/chatcleaner.pro b/chatcleaner.pro index d3d5ba13..df9fc19e 100644 --- a/chatcleaner.pro +++ b/chatcleaner.pro @@ -14,13 +14,13 @@ TEMPLATE = app INCLUDEPATH += src/ \ src/third_party/tinyxml \ src/chatcleaner/ \ - src/third_party/asn1/ \ - src/net/ + src/third_party/asn1/ \ + src/net/ DEPENDPATH += src/ \ src/third_party/tinyxml \ src/chatcleaner/ \ - src/third_party/asn1/ \ - src/net/ + src/third_party/asn1/ \ + src/net/ SOURCES += chatcleaner.cpp \ cleanerserver.cpp \ messagefilter.cpp \ @@ -33,7 +33,7 @@ SOURCES += chatcleaner.cpp \ tinyxmlparser.cpp \ capsfloodcheck.cpp \ letterrepeatingcheck.cpp \ - urlcheck.cpp + urlcheck.cpp HEADERS += cleanerserver.h \ messagefilter.h \ badwordcheck.h \ @@ -47,20 +47,17 @@ HEADERS += cleanerserver.h \ LIBPATH += lib LIBS += -lpokerth_lib \ -lpokerth_protocol - -win32 { - LIBPATH += ../boost/stage/lib - INCLUDEPATH += ../boost/ - debug:LIBPATH += Debug/lib - release:LIBPATH += Release/lib +win32 { + LIBPATH += ../boost/stage/lib + INCLUDEPATH += ../boost/ + debug:LIBPATH += Debug/lib + release:LIBPATH += Release/lib } - -mac { - # make it universal +mac { + # make it universal CONFIG += x86 CONFIG -= ppc QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 - LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ } diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index 16137cc2..652914a1 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -270,8 +270,6 @@ ServerGame::InternalStartGame() m_game.reset(new Game(&gui, factory, playerData, GetGameData(), GetStartData(), GetNextGameNum())); GetLobbyThread().NotifyStartingGame(GetId()); - if (GetGameData().gameType == GAME_TYPE_RANKING) - GetLobbyThread().GetDatabase().AsyncCreateGame(GetId(), GetName()); } void diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index 5e616b09..19a327d7 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -650,6 +650,8 @@ ServerGameStateStartGame::DoStart(boost::shared_ptr server) else { server->InternalStartGame(); + if (server->GetGameData().gameType == GAME_TYPE_RANKING) + server->GetLobbyThread().GetDatabase().AsyncCreateGame(server->GetId(), server->GetName()); boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_gameStartMessage; @@ -928,10 +930,11 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr server) // Store winner in database. boost::shared_ptr winnerPlayer = *(playersWithCash.begin()); boost::shared_ptr tmpPlayer = server->GetPlayerDataByUniqueId(winnerPlayer->getMyUniqueID()); - if (tmpPlayer && server->GetDBId()) + if (server->GetGameData().gameType == GAME_TYPE_RANKING && tmpPlayer && server->GetDBId()) { cerr << "Setting winner for game " << server->GetDBId() << " player id " << tmpPlayer->GetDBId() << endl; server->GetLobbyThread().GetDatabase().SetGamePlayerPlace(server->GetDBId(), tmpPlayer->GetDBId(), 1); + server->GetLobbyThread().GetDatabase().EndGame(server->GetDBId()); } // View a dialog for a new game - delayed.