This commit is contained in:
Paul 2001-08-14 13:50:56 +00:00
parent f0e91d6551
commit dfcea0f955

View file

@ -1436,17 +1436,6 @@ void CFmaScene::think(int _frames)
m_musicPlaying=true; m_musicPlaying=true;
} }
if(PadGetHeld(0) & PAD_START)
{ // Give player an exit option!!
m_scriptRunning=false;
m_doOtherProcessing=true;
}
if(m_scriptRunning==false&&!m_readyToShutdown)
{
startShutdown();
}
for(int i=0;i<_frames;i++) for(int i=0;i<_frames;i++)
{ {
if(m_scriptRunning) if(m_scriptRunning)
@ -1602,6 +1591,17 @@ void CFmaScene::think(int _frames)
} }
} }
if(!CFader::isFading()&&PadGetHeld(0) & PAD_START)
{ // Give player an exit option!!
m_scriptRunning=false;
m_doOtherProcessing=true;
}
if(m_scriptRunning==false&&!m_readyToShutdown)
{
startShutdown();
}
CThingManager::thinkAllThings(_frames); CThingManager::thinkAllThings(_frames);
CConversation::think(_frames); CConversation::think(_frames);