This commit is contained in:
Paul 2000-10-26 16:50:54 +00:00
parent 98a2014037
commit ee30817b75
5 changed files with 34 additions and 20 deletions

View file

@ -46,21 +46,26 @@ void GameState::think()
{
updateTimer();
if( s_pendingScene )
if(s_pendingScene)
{
if(s_currentScene)
{
if( !s_currentScene)
if(s_currentScene->readyToShutdown())
{
if( s_currentScene )
{
ASSERT(s_pendingScene); // There really should be a scene pending before you shutdown..!
s_currentScene->shutdown();
}
s_currentScene=s_pendingScene;
s_pendingScene=NULL;
s_currentScene->init();
s_currentScene=NULL;
}
}
if(!s_currentScene)
{
s_currentScene=s_pendingScene;
s_currentScene->init();
s_pendingScene=NULL;
}
}
ASSERT(s_currentScene);
s_currentScene->think(getFramesSinceLast());
}