actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename SM_Success -> SM_SaveSuccessful and SM_Failure to SM_SaveFailed

Browse Source 
in the editor, to avoid confusion with the SM_Success message sent when
Prompt pops itself.

Merge completion prompts in home and full mode.  Only show a full
ScreenPrompt if we're about to exit the screen.
This commit is contained in:
Glenn Maynard
2005-12-29 03:27:21 +00:00
parent 6657db528d
commit 9f5b83f65c
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+12 -13
View File
@@ -74,6 +74,8 @@ AutoScreenMessage( SM_BackFromBPMChange )
AutoScreenMessage( SM_BackFromStopChange ) AutoScreenMessage( SM_BackFromStopChange )
AutoScreenMessage( SM_DoSaveAndExit ) AutoScreenMessage( SM_DoSaveAndExit )
AutoScreenMessage( SM_DoExit ) AutoScreenMessage( SM_DoExit )
AutoScreenMessage( SM_SaveSuccessful );
AutoScreenMessage( SM_SaveFailed );
static const CString EditStateNames[] = { static const CString EditStateNames[] = {
"Edit", "Edit",
@@ -2197,6 +2199,8 @@ void ScreenEdit::ScrollTo( float fDestinationBeat )
m_soundChangeLine.Play(); m_soundChangeLine.Play();
} }
static LocalizedString SAVE_SUCCESSFUL ( "ScreenEdit", "Save successful." );
void ScreenEdit::HandleScreenMessage( const ScreenMessage SM ) void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
{ {
if( SM != SM_UpdateTextInfo ) if( SM != SM_UpdateTextInfo )
@@ -2350,7 +2354,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
switch( ScreenPrompt::s_LastAnswer ) switch( ScreenPrompt::s_LastAnswer )
{ {
case ANSWER_YES: case ANSWER_YES:
// This will send SM_Success or SM_Failure. // This will send SM_SaveSuccessful or SM_SaveFailed.
HandleMainMenuChoice( ScreenEdit::save_on_exit ); HandleMainMenuChoice( ScreenEdit::save_on_exit );
return; return;
case ANSWER_NO: case ANSWER_NO:
@@ -2361,16 +2365,18 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
break; // do nothing break; // do nothing
} }
} }
else if( SM == SM_Success ) else if( SM == SM_SaveSuccessful )
{ {
LOG->Trace( "Save successful." ); LOG->Trace( "Save successful." );
m_pSteps->SetSavedToDisk( true ); m_pSteps->SetSavedToDisk( true );
CopyToLastSave(); CopyToLastSave();
if( m_CurrentAction == save_on_exit ) if( m_CurrentAction == save_on_exit )
HandleScreenMessage( SM_DoExit ); ScreenPrompt::Prompt( SM_DoExit, SAVE_SUCCESSFUL );
else
SCREENMAN->SystemMessage( SAVE_SUCCESSFUL );
} }
else if( SM == SM_Failure ) // save failed; stay in the editor else if( SM == SM_SaveFailed ) // save failed; stay in the editor
{ {
/* We committed the steps to SongManager. Revert to the last save, and /* We committed the steps to SongManager. Revert to the last save, and
* recommit the reversion to SongManager. */ * recommit the reversion to SongManager. */
@@ -2518,12 +2524,10 @@ static void ChangeArtistTranslit( const CString &sNew )
// End helper functions // End helper functions
static LocalizedString SAVE_SUCCESSFUL ( "ScreenEdit", "Save successful." );
static LocalizedString REVERT_LAST_SAVE ( "ScreenEdit", "Do you want to revert to your last save?" ); static LocalizedString REVERT_LAST_SAVE ( "ScreenEdit", "Do you want to revert to your last save?" );
static LocalizedString DESTROY_ALL_UNSAVED_CHANGES ( "ScreenEdit", "This will destroy all unsaved changes." ); static LocalizedString DESTROY_ALL_UNSAVED_CHANGES ( "ScreenEdit", "This will destroy all unsaved changes." );
static LocalizedString REVERT_FROM_DISK ( "ScreenEdit", "Do you want to revert from disk?" ); static LocalizedString REVERT_FROM_DISK ( "ScreenEdit", "Do you want to revert from disk?" );
static LocalizedString SAVE_CHANGES_BEFORE_EXITING ( "ScreenEdit", "Do you want to save changes before exiting?" ); static LocalizedString SAVE_CHANGES_BEFORE_EXITING ( "ScreenEdit", "Do you want to save changes before exiting?" );
static LocalizedString SAVED ( "ScreenEdit", "Saved '%s'" );
static LocalizedString ENTER_BPM_VALUE ( "ScreenEdit", "Enter a new BPM value." ); static LocalizedString ENTER_BPM_VALUE ( "ScreenEdit", "Enter a new BPM value." );
static LocalizedString ENTER_STOP_VALUE ( "ScreenEdit", "Enter a new Stop value." ); static LocalizedString ENTER_STOP_VALUE ( "ScreenEdit", "Enter a new Stop value." );
void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAnswers ) void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAnswers )
@@ -2608,10 +2612,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
SCREENMAN->ZeroNextUpdate(); SCREENMAN->ZeroNextUpdate();
CString s = ssprintf( SAVED.GetValue(), Basename(pSteps->GetFilename()).c_str() ); HandleScreenMessage( SM_SaveSuccessful );
ScreenPrompt::Prompt( SM_None, s );
HandleScreenMessage( SM_Success );
/* FIXME /* FIXME
CString s; CString s;
@@ -2630,9 +2631,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
pSong->Save(); pSong->Save();
SCREENMAN->ZeroNextUpdate(); SCREENMAN->ZeroNextUpdate();
SCREENMAN->SystemMessage( SAVE_SUCCESSFUL ); HandleScreenMessage( SM_SaveSuccessful );
HandleScreenMessage( SM_Success );
} }
break; break;
case EditMode_Practice: case EditMode_Practice: