Fixing some timer problems. Starting an internet game now works again. There are still some issues: Games are never terminated, and error handling is not implemented (errors will terminate the server).

This commit is contained in:
lotodore
2009-05-31 13:47:10 +00:00
parent 59358bff0e
commit fab224c8ad
3 changed files with 8 additions and 5 deletions
+4 -1
View File
@@ -41,7 +41,7 @@ using namespace std;
ServerGameThread::ServerGameThread(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_id(id), m_name(name), m_password(pwd), m_playerConfig(playerConfig),
m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name), m_password(pwd), m_playerConfig(playerConfig),
m_gameNum(1), m_curPetitionId(1), m_stateTimerId(0)
{
LOG_VERBOSE("Game object " << GetId() << " created.");
@@ -721,7 +721,10 @@ ServerGameThread::GetState()
void
ServerGameThread::SetState(ServerGameState &newState)
{
if (m_curState)
m_curState->Exit(*this);
m_curState = &newState;
m_curState->Enter(*this);
}
unsigned