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

cleanup: don't need a special case for this anymore

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-18 02:39:51 +00:00
parent 93f9d0e3e5
commit 15558d4cac
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+4 -7
View File
@@ -30,8 +30,6 @@
#include "ActorUtil.h" #include "ActorUtil.h"
#include "ScreenPrompt.h" #include "ScreenPrompt.h"
#include "CommonMetrics.h" #include "CommonMetrics.h"
#include "ScreenPlayerOptions.h" // for SM_BackFromPlayerOptions
#include "ScreenSongOptions.h" // for SM_BackFromSongOptions
#include <float.h> #include <float.h>
#include "BackgroundUtil.h" #include "BackgroundUtil.h"
@@ -57,6 +55,7 @@ AutoScreenMessage( SM_UpdateTextInfo )
AutoScreenMessage( SM_BackFromMainMenu ) AutoScreenMessage( SM_BackFromMainMenu )
AutoScreenMessage( SM_BackFromAreaMenu ) AutoScreenMessage( SM_BackFromAreaMenu )
AutoScreenMessage( SM_BackFromStepsInformation ) AutoScreenMessage( SM_BackFromStepsInformation )
AutoScreenMessage( SM_BackFromPlayerOptions )
AutoScreenMessage( SM_BackFromEditOptions ) AutoScreenMessage( SM_BackFromEditOptions )
AutoScreenMessage( SM_BackFromSongInformation ) AutoScreenMessage( SM_BackFromSongInformation )
AutoScreenMessage( SM_BackFromBGChange ) AutoScreenMessage( SM_BackFromBGChange )
@@ -1739,9 +1738,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
ASSERT( m_pAttacksFromCourse ); ASSERT( m_pAttacksFromCourse );
} }
} }
else if( else if( SM == SM_BackFromPlayerOptions )
SM == SM_BackFromPlayerOptions ||
SM == SM_BackFromSongOptions )
{ {
GAMESTATE->StoreSelectedOptions(); // so that the options stick when we reset Course attacks GAMESTATE->StoreSelectedOptions(); // so that the options stick when we reset Course attacks
@@ -2084,10 +2081,10 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
PROMPT_YES_NO, ANSWER_NO ); PROMPT_YES_NO, ANSWER_NO );
break; break;
case player_options: case player_options:
SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptionsEdit" ); SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptionsEdit", SM_BackFromPlayerOptions );
break; break;
case song_options: case song_options:
SCREENMAN->AddNewScreenToTop( "ScreenSongOptionsEdit" ); SCREENMAN->AddNewScreenToTop( "ScreenSongOptionsEdit", SM_BackFromPlayerOptions );
break; break;
case edit_song_info: case edit_song_info:
{ {