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

Remove log object from server, server-side logging is deactivated. Pass NULL as log object to game.

Browse Source
This commit is contained in:
lotodore
2012-01-02 21:04:49 +00:00
parent aa6fdf1de1
commit df35ea550f
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergame.cpp
+3 -4
View File
@@ -30,7 +30,6 @@
#include <db/serverdbinterface.h>
#include <db/serverdbnoaction.h>
#include <game.h>
#include <log.h>
#include <localenginefactory.h>
#include <tools.h>
#include <configfile.h>
@@ -47,10 +46,10 @@ static bool LessThanPlayerHandStartMoney(const boost::shared_ptr<PlayerInterface
}
ServerGame::ServerGame(boost::shared_ptr<ServerLobbyThread> lobbyThread, u_int32_t id, const string &name, const string &pwd, const GameData &gameData, unsigned adminPlayerId, GuiInterface &gui, ConfigFile &playerConfig, Log &serverLog)
ServerGame::ServerGame(boost::shared_ptr<ServerLobbyThread> lobbyThread, u_int32_t id, const string &name, const string &pwd, const GameData &gameData, unsigned adminPlayerId, GuiInterface &gui, ConfigFile &playerConfig)
: m_adminPlayerId(adminPlayerId), m_lobbyThread(lobbyThread), m_gui(gui),
m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name),
m_password(pwd), m_playerConfig(playerConfig), m_serverLog(serverLog), m_gameNum(1),
m_password(pwd), m_playerConfig(playerConfig), m_gameNum(1),
m_curPetitionId(1), m_voteKickTimer(lobbyThread->GetIOService()),
m_stateTimer1(lobbyThread->GetIOService()), m_stateTimer2(lobbyThread->GetIOService())
{
@@ -285,7 +284,7 @@ ServerGame::InternalStartGame()
SetStartData(startData);
GuiInterface &gui = GetGui();
m_game.reset(new Game(&gui, factory, playerData, GetGameData(), GetStartData(), GetNextGameNum(), &m_serverLog));
m_game.reset(new Game(&gui, factory, playerData, GetGameData(), GetStartData(), GetNextGameNum(), NULL));
GetDatabase().AsyncCreateGame(GetId(), GetName());
InitRankingMap(playerData);