cleanup: don't export options from SM_GoToNextScreen

(need to get rid of this AutoScreenMessage thing; causes duplicate variables
to be declared for every file that includes it)
This commit is contained in:
Glenn Maynard
2005-07-12 06:10:01 +00:00
parent 4c1920474c
commit cd76a879f6
3 changed files with 14 additions and 9 deletions
+10 -7
View File
@@ -503,12 +503,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
{
this->BeginFadingOut();
}
else if( SM == SM_GoToPrevScreen )
{
// this->ExportOptions(); // Don't save options if we're going back!
this->GoToPrevScreen();
}
else if( SM == SM_GoToNextScreen )
else if( SM == SM_ExportOptions )
{
for( unsigned r=0; r<m_pRows.size(); r++ ) // foreach row
{
@@ -517,13 +512,21 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
vpns.push_back( p );
this->ExportOptions( r, vpns );
}
this->HandleScreenMessage( SM_GoToNextScreen );
}
else if( SM == SM_GoToNextScreen )
{
this->GoToNextScreen();
}
else if( SM == SM_GoToPrevScreen )
{
this->GoToPrevScreen();
}
else if( SM == SM_BeginFadingOut )
{
if(IsTransitioning())
return; /* already transitioning */
StartTransitioning( SM_GoToNextScreen );
StartTransitioning( SM_ExportOptions );
SCREENMAN->PlayStartSound();