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

Fixing server announcement. Gui callback still needed.

Browse Source
This commit is contained in:
lotodore
2009-11-08 09:48:01 +00:00
parent f1c213b707
commit 5424aed21e
9 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+16 -13
View File
@@ -138,10 +138,10 @@ private:
};
ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ServerIrcBotCallback &ircBotCb, ConfigFile *playerConfig, AvatarManager &avatarManager,
boost::shared_ptr<boost::asio::io_service> ioService)
ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ServerMode mode, ServerIrcBotCallback &ircBotCb, ConfigFile *playerConfig,
AvatarManager &avatarManager, boost::shared_ptr<boost::asio::io_service> ioService)
: m_ioService(ioService), m_authContext(NULL), m_gui(gui), m_ircBotCb(ircBotCb), m_avatarManager(avatarManager),
m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1),
m_mode(mode), m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1),
m_statDataChanged(false), m_removeGameTimer(*ioService), m_removePlayerTimer(*ioService),
m_sessionTimeoutTimer(*ioService), m_avatarCleanupTimer(*ioService),
m_saveStatisticsTimer(*ioService), m_avatarLockTimer(*ioService),
@@ -161,9 +161,8 @@ ServerLobbyThread::~ServerLobbyThread()
}
void
ServerLobbyThread::Init(const string &pwd, const string &logDir)
ServerLobbyThread::Init(const string &logDir)
{
m_password = pwd;
// Read previous server statistics.
if (!logDir.empty())
{
@@ -225,8 +224,18 @@ ServerLobbyThread::AddConnection(boost::shared_ptr<tcp::socket> sock)
netAnnounce->latestGameVersion.major = POKERTH_VERSION_MAJOR;
netAnnounce->latestGameVersion.minor = POKERTH_VERSION_MINOR;
netAnnounce->latestBetaRevision = POKERTH_BETA_REVISION;
// TODO
netAnnounce->serverType = serverType_serverTypeLAN;
switch (m_mode)
{
case SERVER_MODE_LAN:
netAnnounce->serverType = serverType_serverTypeLAN;
break;
case SERVER_MODE_INTERNET_NOAUTH:
netAnnounce->serverType = serverType_serverTypeInternetNoAuth;
break;
case SERVER_MODE_INTERNET_AUTH:
netAnnounce->serverType = serverType_serverTypeInternetAuth;
break;
}
GetSender().Send(sessionData, packet);
sock->async_read_some(
@@ -1894,12 +1903,6 @@ ServerLobbyThread::GetReceiver()
return *m_receiver;
}
bool
ServerLobbyThread::CheckPassword(const string &password) const
{
return (password == m_password);
}
InternalServerCallback &
ServerLobbyThread::GetSenderCallback()
{