From 5b9ab7244bd7258dd63f6546657c449aece2af7d Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 19 Apr 2005 04:11:33 +0000 Subject: [PATCH] fix GCC errors --- stepmania/src/EditMenu.cpp | 10 +++++----- stepmania/src/NoteField.cpp | 2 +- stepmania/src/ScreenEdit.cpp | 18 +++++++++--------- stepmania/src/ScreenEditMenu.cpp | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 4caba0dd78..d619f87aa8 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -58,7 +58,7 @@ static void GetSongsToShowForGroup( const CString &sGroup, vector &vpSong { vpSongsOut.clear(); SONGMAN->GetSongs( vpSongsOut, sGroup ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: case EDIT_MODE_HOME: @@ -347,7 +347,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row ) FOREACH_CONST( Steps*, v, p ) m_vpSteps.push_back( StepsAndDifficulty(*p,dc) ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: break; @@ -362,7 +362,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row ) { Steps *pSteps = GetSelectedSong()->GetStepsByDifficulty( GetSelectedStepsType(), dc ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_HOME: // don't allow selecting of non-edits in HomeMode @@ -402,7 +402,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row ) s = DifficultyToThemedString(GetSelectedDifficulty()); // UGLY. "Edit" -> "New Edit" - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_HOME: s = "New " + s; @@ -477,7 +477,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row ) if( GetSelectedSteps() ) { m_Actions.push_back( EDIT_MENU_ACTION_EDIT ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: break; diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 0282e1865c..91155edcec 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -514,7 +514,7 @@ void NoteField::DrawPrimitives() // // BGChange text // - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_HOME: case EDIT_MODE_PRACTICE: diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 9a8b9b99b4..cdf4030a1a 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -753,7 +753,7 @@ void ScreenEdit::UpdateTextInfo() CString sText; sText += ssprintf( "Current beat:\n %.3f\n", GAMESTATE->m_fSongBeat ); sText += ssprintf( "Current sec:\n %.3f\n", m_pSong->GetElapsedTimeFromBeat(GAMESTATE->m_fSongBeat) ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: break; @@ -765,7 +765,7 @@ void ScreenEdit::UpdateTextInfo() ASSERT(0); } sText += ssprintf( "Selection beat:\n %s\n %s\n", m_NoteFieldEdit.m_iBeginMarker==-1 ? "----" : ssprintf("%.3f",NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker)).c_str(), m_NoteFieldEdit.m_iEndMarker==-1 ? "----" : ssprintf("%.3f",NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker)).c_str() ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: case EDIT_MODE_HOME: @@ -784,7 +784,7 @@ void ScreenEdit::UpdateTextInfo() sText += ssprintf( "Hands:\n %d\n", iNumHands ); sText += ssprintf( "Holds:\n %d\n", iNumHolds ); sText += ssprintf( "Mines:\n %d\n", iNumMines ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: case EDIT_MODE_HOME: @@ -1804,7 +1804,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns FOREACH_Difficulty( dc ) g_StepsInformation.rows[difficulty].choices.push_back( DifficultyToThemedString(pSteps->GetDifficulty()) ); g_StepsInformation.rows[difficulty].iDefaultChoice = pSteps->GetDifficulty(); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: case EDIT_MODE_HOME: @@ -1817,7 +1817,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns ASSERT(0); } g_StepsInformation.rows[meter].iDefaultChoice = clamp( pSteps->GetMeter()-1, 0, MAX_METER+1 ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: g_StepsInformation.rows[meter].bEnabled = false; @@ -1833,7 +1833,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns g_StepsInformation.rows[predict_meter].choices[0] = ssprintf("%.2f",pSteps->PredictMeter()); g_StepsInformation.rows[description].choices.resize(1); g_StepsInformation.rows[description].choices[0] = pSteps->GetDescription(); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: case EDIT_MODE_HOME: @@ -1887,7 +1887,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns pSteps->SetNoteData( m_NoteDataEdit ); pSteps->CalculateRadarValues( pSong->m_fMusicLengthSeconds ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_HOME: { @@ -2091,7 +2091,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns PlayPreviewMusic(); break; case exit: - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_FULL: case EDIT_MODE_HOME: @@ -2730,7 +2730,7 @@ void ScreenEdit::CheckNumberOfNotesAndUndo() float ScreenEdit::GetMaximumBeatForNewNote() const { - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_PRACTICE: case EDIT_MODE_HOME: diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index adbdf67735..71df95cc77 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -62,7 +62,7 @@ void DeleteCurSteps( void* pThrowAway ) Song* pSong = GAMESTATE->m_pCurSong; Steps* pStepsToDelete = GAMESTATE->m_pCurSteps[PLAYER_1]; pSong->RemoveSteps( pStepsToDelete ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_HOME: break; @@ -230,7 +230,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) break; case EDIT_MENU_ACTION_DELETE: ASSERT( pSteps ); - switch( EDIT_MODE ) + switch( EDIT_MODE.GetValue() ) { case EDIT_MODE_HOME: SCREENMAN->AddNewScreenToTop( "ScreenEditMenuDeleteSteps" );