Fix incorrect behavior when START is pressed during transitions on

options screens.  (We don't ignore this at a higher level, because we
want to allow start when transitioning when it's not going to go to another
screen.)
This commit is contained in:
Glenn Maynard
2006-02-18 03:02:21 +00:00
parent 7ed5caf16b
commit 35599d7f97
6 changed files with 18 additions and 0 deletions
@@ -250,6 +250,9 @@ void ScreenOptionsEditCourse::ExportOptions( int iRow, const vector<PlayerNumber
void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input ) void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
{ {
if( IsTransitioning() )
return;
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
Course *pCourse = GAMESTATE->m_pCurCourse; Course *pCourse = GAMESTATE->m_pCurCourse;
@@ -126,6 +126,9 @@ void ScreenOptionsEditProfile::AfterChangeValueInRow( int iRow, PlayerNumber pn
void ScreenOptionsEditProfile::ProcessMenuStart( const InputEventPlus &input ) void ScreenOptionsEditProfile::ProcessMenuStart( const InputEventPlus &input )
{ {
if( IsTransitioning() )
return;
int iRow = GetCurrentRow();; int iRow = GetCurrentRow();;
//OptionRow &row = *m_pRows[iRow]; //OptionRow &row = *m_pRows[iRow];
@@ -343,6 +343,9 @@ static LocalizedString YOU_HAVE_MAXIMUM_EDITS_ALLOWED( "ScreenOptionsManageCours
static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageCourses", "You must delete an existing course edit before creating a new course edit." ); static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageCourses", "You must delete an existing course edit before creating a new course edit." );
void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input ) void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input )
{ {
if( IsTransitioning() )
return;
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
if( iCurRow == 0 ) // "create new" if( iCurRow == 0 ) // "create new"
@@ -237,6 +237,9 @@ static LocalizedString YOU_HAVE_MAX_STEP_EDITS( "ScreenOptionsManageEditSteps",
static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageEditSteps", "You must delete an existing steps edit before creating a new steps edit." ); static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageEditSteps", "You must delete an existing steps edit before creating a new steps edit." );
void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input ) void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input )
{ {
if( IsTransitioning() )
return;
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
if( iCurRow == 0 ) // "create new" if( iCurRow == 0 ) // "create new"
@@ -287,6 +287,9 @@ void ScreenOptionsManageProfiles::AfterChangeRow( PlayerNumber pn )
void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input ) void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input )
{ {
if( IsTransitioning() )
return;
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
OptionRow &row = *m_pRows[iCurRow]; OptionRow &row = *m_pRows[iCurRow];
@@ -171,6 +171,9 @@ void ScreenOptionsMemoryCard::SelectRowWithMemoryCard( const RString &sOsMountPo
static LocalizedString ERROR_MOUNTING_CARD ("ScreenOptionsMemoryCard", "Error mounting card: %s" ); static LocalizedString ERROR_MOUNTING_CARD ("ScreenOptionsMemoryCard", "Error mounting card: %s" );
void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input ) void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input )
{ {
if( IsTransitioning() )
return;
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices; const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;