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

Pass ConfigFile to ClientThread constructor.

Browse Source
This commit is contained in:
lotodore
2011-10-20 12:03:20 +00:00
parent 603d4826fd
commit 28d7904265
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/clientthread.h
+2 -1
View File
@@ -41,12 +41,13 @@ class NetPacket;
class AvatarManager; class AvatarManager;
class Log; class Log;
class QtToolsInterface; class QtToolsInterface;
class ConfigFile;
struct Gsasl; struct Gsasl;
class ClientThread : public Thread, public boost::enable_shared_from_this<ClientThread>, public SessionDataCallback class ClientThread : public Thread, public boost::enable_shared_from_this<ClientThread>, public SessionDataCallback
{ {
public: public:
ClientThread(GuiInterface &gui, AvatarManager &avatarManager); ClientThread(GuiInterface &gui, AvatarManager &avatarManager, ConfigFile *config);
virtual ~ClientThread(); virtual ~ClientThread();
// Set the parameters. Does not do any error checking. // Set the parameters. Does not do any error checking.
src/net/common/clientthread.cpp
+1 -1
View File
@@ -49,7 +49,7 @@
using namespace std; using namespace std;
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
ClientThread::ClientThread(GuiInterface &gui, AvatarManager &avatarManager) ClientThread::ClientThread(GuiInterface &gui, AvatarManager &avatarManager, ConfigFile *config)
: m_ioService(new boost::asio::io_service), m_curState(NULL), m_gui(gui), : m_ioService(new boost::asio::io_service), m_curState(NULL), m_gui(gui),
m_avatarManager(avatarManager), m_isServerSelected(false), m_avatarManager(avatarManager), m_isServerSelected(false),
m_curGameId(0), m_curGameNum(1), m_guiPlayerId(0), m_sessionEstablished(false), m_curGameId(0), m_curGameNum(1), m_guiPlayerId(0), m_sessionEstablished(false),
src/session.cpp
+3 -3
View File
@@ -169,7 +169,7 @@ void Session::startInternetClient()
} }
myGameType = GAME_TYPE_INTERNET; myGameType = GAME_TYPE_INTERNET;
myNetClient.reset(new ClientThread(*myGui, *myAvatarManager)); myNetClient.reset(new ClientThread(*myGui, *myAvatarManager, myConfig));
bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0; bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0;
myNetClient->Init( myNetClient->Init(
@@ -194,7 +194,7 @@ void Session::startNetworkClient(const string &serverAddress, unsigned serverPor
} }
myGameType = GAME_TYPE_NETWORK; myGameType = GAME_TYPE_NETWORK;
myNetClient.reset(new ClientThread(*myGui, *myAvatarManager)); myNetClient.reset(new ClientThread(*myGui, *myAvatarManager, myConfig));
myNetClient->Init( myNetClient->Init(
serverAddress, serverAddress,
"", "",
@@ -221,7 +221,7 @@ void Session::startNetworkClientForLocalServer(const GameData &gameData)
} }
myGameType = GAME_TYPE_NETWORK; myGameType = GAME_TYPE_NETWORK;
myNetClient.reset(new ClientThread(*myGui, *myAvatarManager)); myNetClient.reset(new ClientThread(*myGui, *myAvatarManager, myConfig));
bool useIpv6 = myConfig->readConfigInt("ServerUseIpv6") == 1; bool useIpv6 = myConfig->readConfigInt("ServerUseIpv6") == 1;
const char *loopbackAddr = useIpv6 ? "::1" : "127.0.0.1"; const char *loopbackAddr = useIpv6 ? "::1" : "127.0.0.1";
myNetClient->Init( myNetClient->Init(