From 2cb065815113eda813fc095145d20a9634df6e70 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 3 Jul 2005 04:34:53 +0000 Subject: [PATCH] ScreenPrompt::Prompt update --- stepmania/src/ScreenEdit.cpp | 10 +++++----- stepmania/src/ScreenEditMenu.cpp | 5 +++-- stepmania/src/ScreenEz2SelectMusic.cpp | 5 +++-- stepmania/src/ScreenProfileOptions.cpp | 8 ++++---- stepmania/src/ScreenTextEntry.cpp | 3 ++- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 83e1988bb0..455ac4cbae 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -2060,12 +2060,12 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns } break; case revert_to_last_save: - SCREENMAN->Prompt( SM_DoRevertToLastSave, + ScreenPrompt::Prompt( SM_DoRevertToLastSave, "Do you want to revert to your last save?\n\nThis will destroy all unsaved changes.", PROMPT_YES_NO, ANSWER_NO ); break; case revert_from_disk: - SCREENMAN->Prompt( SM_DoRevertFromDisk, + ScreenPrompt::Prompt( SM_DoRevertFromDisk, "Do you want to revert from disk?\n\nThis will destroy all unsaved changes.", PROMPT_YES_NO, ANSWER_NO ); break; @@ -2234,7 +2234,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns { case EDIT_MODE_FULL: case EDIT_MODE_HOME: - SCREENMAN->Prompt( + ScreenPrompt::Prompt( SM_DoSaveAndExit, "Do you want to save changes before exiting?", PROMPT_YES_NO_CANCEL, ANSWER_CANCEL ); @@ -2893,7 +2893,7 @@ void ScreenEdit::CheckNumberOfNotesAndUndo() CString sError = ssprintf( "This change creates more than %d notes in a measure.\n\nMore than %d notes per measure is not allowed. This change has been reverted.", MAX_NOTES_PER_MEASURE, MAX_NOTES_PER_MEASURE ); - SCREENMAN->Prompt( SM_None, sError ); + ScreenPrompt::Prompt( SM_None, sError ); return; } } @@ -2911,7 +2911,7 @@ void ScreenEdit::CheckNumberOfNotesAndUndo() Undo(); CString sError = ssprintf( "This change creates notes past the end of the music and is not allowed.\n\nThe change has been reverted." ); - SCREENMAN->Prompt( SM_None, sError ); + ScreenPrompt::Prompt( SM_None, sError ); return; } } diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 442dd64402..3626094f8f 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -14,6 +14,7 @@ #include "song.h" #include "CommonMetrics.h" #include "ScreenTextEntry.h" +#include "ScreenPrompt.h" #define PREV_SCREEN THEME->GetMetric(m_sName,"PrevScreen") #define EXPLANATION_TEXT( row ) THEME->GetMetric(m_sName,"Explanation"+EditMenuRowToString(row)) @@ -217,7 +218,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) if( !pSong->HasMusic() ) { - SCREENMAN->Prompt( SM_None, "This song is missing a music file and cannot be edited" ); + ScreenPrompt::Prompt( SM_None, "This song is missing a music file and cannot be edited" ); return; } @@ -236,7 +237,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) SCREENMAN->AddNewScreenToTop( "ScreenEditMenuDeleteSteps" ); break; case EDIT_MODE_FULL: - SCREENMAN->Prompt( SM_RefreshSelector, "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO, DeleteCurSteps ); + ScreenPrompt::Prompt( SM_RefreshSelector, "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO, DeleteCurSteps ); break; default: ASSERT(0); diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 5ec0f01741..4a0f5525ac 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -16,6 +16,7 @@ #include "MenuTimer.h" #include "StepsUtil.h" #include "ScreenDimensions.h" +#include "ScreenPrompt.h" #include "PlayerState.h" #include "Command.h" #include "RageLog.h" @@ -451,7 +452,7 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn ) { if( !m_MusicBannerWheel.GetSelectedSong()->HasMusic() ) { - SCREENMAN->Prompt( SM_None, "ERROR:\n \nThis song does not have a music file\n and cannot be played." ); + ScreenPrompt::Prompt( SM_None, "ERROR:\n \nThis song does not have a music file\n and cannot be played." ); return; } @@ -497,7 +498,7 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime ) if(m_MusicBannerWheel.CheckSongsExist() == 0 && ! i_ErrorDetected) { - SCREENMAN->Prompt( SM_NoSongs, "ERROR:\n \nThere are no songs available for play!" ); + ScreenPrompt::Prompt( SM_NoSongs, "ERROR:\n \nThere are no songs available for play!" ); i_ErrorDetected=1; this->PostScreenMessage( SM_NoSongs, 5.5f ); // timeout incase the user decides to do nothing :D } diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 98219faad4..6f61ac97f1 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -148,7 +148,7 @@ void ScreenProfileOptions::HandleScreenMessage( const ScreenMessage SM ) if( bResult ) SCREENMAN->SetNewScreen( "ScreenProfileOptions" ); // reload else - SCREENMAN->Prompt( SM_None, ssprintf("Error creating profile '%s'.", sNewName.c_str()) ); + ScreenPrompt::Prompt( SM_None, ssprintf("Error creating profile '%s'.", sNewName.c_str()) ); } } else if( SM == SM_DoneRenaming ) @@ -162,7 +162,7 @@ void ScreenProfileOptions::HandleScreenMessage( const ScreenMessage SM ) if( bResult ) SCREENMAN->SetNewScreen( "ScreenProfileOptions" ); // reload else - SCREENMAN->Prompt( SM_None, ssprintf("Error renaming profile %s '%s'\nto '%s'.", sProfileID.c_str(), sName.c_str(), sNewName.c_str()) ); + ScreenPrompt::Prompt( SM_None, ssprintf("Error renaming profile %s '%s'\nto '%s'.", sProfileID.c_str(), sName.c_str(), sNewName.c_str()) ); } } else if ( SM == SM_DoneDeleting ) @@ -175,7 +175,7 @@ void ScreenProfileOptions::HandleScreenMessage( const ScreenMessage SM ) if( bResult ) SCREENMAN->SetNewScreen( "ScreenProfileOptions" ); // reload else - SCREENMAN->Prompt( SM_None, ssprintf("Error deleting profile %s '%s'.", sName.c_str(), sProfileID.c_str()) ); + ScreenPrompt::Prompt( SM_None, ssprintf("Error deleting profile %s '%s'.", sName.c_str(), sProfileID.c_str()) ); } } @@ -198,7 +198,7 @@ void ScreenProfileOptions::MenuStart( PlayerNumber pn, const InputEventType type if( sProfileID=="" ) SCREENMAN->PlayInvalidSound(); else - SCREENMAN->Prompt( SM_DoneDeleting, ssprintf("Delete profile %s '%s'?",sProfileID.c_str(),sName.c_str()), PROMPT_YES_NO, ANSWER_NO ); + ScreenPrompt::Prompt( SM_DoneDeleting, ssprintf("Delete profile %s '%s'?",sProfileID.c_str(),sName.c_str()), PROMPT_YES_NO, ANSWER_NO ); break; } case PO_RENAME_: diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 04e0e9cc4e..63a739187d 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -8,6 +8,7 @@ #include "ThemeManager.h" #include "FontCharAliases.h" #include "ScreenDimensions.h" +#include "ScreenPrompt.h" #include "ActorUtil.h" @@ -386,7 +387,7 @@ void ScreenTextEntry::End( bool bCancelled ) bool bValidAnswer = m_pValidate( sAnswer, sError ); if( !bValidAnswer ) { - SCREENMAN->Prompt( SM_None, sError ); + ScreenPrompt::Prompt( SM_None, sError ); return; // don't end this screen. } }