diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-11 20:16:41 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-11 20:16:41 +0200 |
| commit | 4c5590636cf4a311f03e735878557b1e7b3362dd (patch) | |
| tree | cc74a43b0ab34481a7d972ed35beb20008bd390b /source/Root.cpp | |
| parent | Removed cServer::m_pState, dissolved into direct member variables. (diff) | |
| download | cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.tar cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.tar.gz cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.tar.bz2 cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.tar.lz cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.tar.xz cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.tar.zst cuberite-4c5590636cf4a311f03e735878557b1e7b3362dd.zip | |
Diffstat (limited to 'source/Root.cpp')
| -rw-r--r-- | source/Root.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/Root.cpp b/source/Root.cpp index 5ec27aa0d..166932cf2 100644 --- a/source/Root.cpp +++ b/source/Root.cpp @@ -270,8 +270,9 @@ void cRoot::LoadWorlds(void) void cRoot::StartWorlds(void) { - for( WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr ) + for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr) { + itr->second->Start(); itr->second->InitializeSpawn(); } } @@ -282,9 +283,9 @@ void cRoot::StartWorlds(void) void cRoot::StopWorlds(void) { - for( WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr ) + for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr) { - itr->second->StopThreads(); + itr->second->Stop(); } } @@ -344,7 +345,7 @@ bool cRoot::ForEachWorld(cWorldListCallback & a_Callback) -void cRoot::TickWorlds(float a_Dt) +void cRoot::TickCommands(void) { // Execute any pending commands: cCommandQueue PendingCommands; @@ -356,12 +357,6 @@ void cRoot::TickWorlds(float a_Dt) { ExecuteConsoleCommand(itr->m_Command, *(itr->m_Output)); } - - // Tick the worlds: - for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr) - { - itr->second->Tick(a_Dt); - } } |