Fixing some compiler warnings and single-threaded game issues. Note: The server currently crashes when trying to start a game.
This commit is contained in:
@@ -252,7 +252,8 @@ irc_event_numeric(irc_session_t * session, unsigned irc_event, const char * /*or
|
||||
}
|
||||
|
||||
IrcThread::IrcThread(const IrcThread &other)
|
||||
: m_terminationTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start),
|
||||
: Thread(),
|
||||
m_terminationTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start),
|
||||
m_lastConnectTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start)
|
||||
{
|
||||
m_callback = other.m_callback;
|
||||
|
||||
@@ -690,7 +690,7 @@ ServerGameStateHand::HandleNewSession(SessionWrapper session)
|
||||
}
|
||||
|
||||
int
|
||||
ServerGameStateHand::InternalProcessPacket(SessionWrapper session, boost::shared_ptr<NetPacket> packet)
|
||||
ServerGameStateHand::InternalProcessPacket(SessionWrapper /*session*/, boost::shared_ptr<NetPacket> /*packet*/)
|
||||
{
|
||||
// TODO: maybe reject packet.
|
||||
return MSG_SOCK_INTERNAL_PENDING;
|
||||
|
||||
@@ -198,6 +198,8 @@ ServerLobbyThread::MoveSessionToGame(ServerGameThread &game, SessionWrapper sess
|
||||
m_gameSessionManager.AddSession(session);
|
||||
// Add session to the game.
|
||||
game.AddSession(session);
|
||||
// Set the game id of the session.
|
||||
session.sessionData->SetGameId(game.GetId());
|
||||
}
|
||||
|
||||
void
|
||||
@@ -205,6 +207,7 @@ ServerLobbyThread::RemoveSessionFromGame(SessionWrapper session)
|
||||
{
|
||||
// Just remove the session. Only for fatal errors.
|
||||
CloseSession(session);
|
||||
session.sessionData->SetGameId(0);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1271,6 +1274,7 @@ ServerLobbyThread::HandleReAddedSession(SessionWrapper session)
|
||||
{
|
||||
// Set state (back) to established.
|
||||
session.sessionData->SetState(SessionData::Established);
|
||||
session.sessionData->SetGameId(0);
|
||||
// Add session to lobby list.
|
||||
m_sessionManager.AddSession(session);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user