fix GCC errors
This commit is contained in:
@@ -58,7 +58,7 @@ static void GetSongsToShowForGroup( const CString &sGroup, vector<Song*> &vpSong
|
|||||||
{
|
{
|
||||||
vpSongsOut.clear();
|
vpSongsOut.clear();
|
||||||
SONGMAN->GetSongs( vpSongsOut, sGroup );
|
SONGMAN->GetSongs( vpSongsOut, sGroup );
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
@@ -347,7 +347,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
|
|||||||
FOREACH_CONST( Steps*, v, p )
|
FOREACH_CONST( Steps*, v, p )
|
||||||
m_vpSteps.push_back( StepsAndDifficulty(*p,dc) );
|
m_vpSteps.push_back( StepsAndDifficulty(*p,dc) );
|
||||||
|
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
break;
|
break;
|
||||||
@@ -362,7 +362,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
|
|||||||
{
|
{
|
||||||
Steps *pSteps = GetSelectedSong()->GetStepsByDifficulty( GetSelectedStepsType(), dc );
|
Steps *pSteps = GetSelectedSong()->GetStepsByDifficulty( GetSelectedStepsType(), dc );
|
||||||
|
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
// don't allow selecting of non-edits in HomeMode
|
// don't allow selecting of non-edits in HomeMode
|
||||||
@@ -402,7 +402,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
|
|||||||
s = DifficultyToThemedString(GetSelectedDifficulty());
|
s = DifficultyToThemedString(GetSelectedDifficulty());
|
||||||
|
|
||||||
// UGLY. "Edit" -> "New Edit"
|
// UGLY. "Edit" -> "New Edit"
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
s = "New " + s;
|
s = "New " + s;
|
||||||
@@ -477,7 +477,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
|
|||||||
if( GetSelectedSteps() )
|
if( GetSelectedSteps() )
|
||||||
{
|
{
|
||||||
m_Actions.push_back( EDIT_MENU_ACTION_EDIT );
|
m_Actions.push_back( EDIT_MENU_ACTION_EDIT );
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -514,7 +514,7 @@ void NoteField::DrawPrimitives()
|
|||||||
//
|
//
|
||||||
// BGChange text
|
// BGChange text
|
||||||
//
|
//
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
|
|||||||
@@ -753,7 +753,7 @@ void ScreenEdit::UpdateTextInfo()
|
|||||||
CString sText;
|
CString sText;
|
||||||
sText += ssprintf( "Current beat:\n %.3f\n", GAMESTATE->m_fSongBeat );
|
sText += ssprintf( "Current beat:\n %.3f\n", GAMESTATE->m_fSongBeat );
|
||||||
sText += ssprintf( "Current sec:\n %.3f\n", m_pSong->GetElapsedTimeFromBeat(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:
|
case EDIT_MODE_PRACTICE:
|
||||||
break;
|
break;
|
||||||
@@ -765,7 +765,7 @@ void ScreenEdit::UpdateTextInfo()
|
|||||||
ASSERT(0);
|
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() );
|
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_PRACTICE:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
@@ -784,7 +784,7 @@ void ScreenEdit::UpdateTextInfo()
|
|||||||
sText += ssprintf( "Hands:\n %d\n", iNumHands );
|
sText += ssprintf( "Hands:\n %d\n", iNumHands );
|
||||||
sText += ssprintf( "Holds:\n %d\n", iNumHolds );
|
sText += ssprintf( "Holds:\n %d\n", iNumHolds );
|
||||||
sText += ssprintf( "Mines:\n %d\n", iNumMines );
|
sText += ssprintf( "Mines:\n %d\n", iNumMines );
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
@@ -1804,7 +1804,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
|
|||||||
FOREACH_Difficulty( dc )
|
FOREACH_Difficulty( dc )
|
||||||
g_StepsInformation.rows[difficulty].choices.push_back( DifficultyToThemedString(pSteps->GetDifficulty()) );
|
g_StepsInformation.rows[difficulty].choices.push_back( DifficultyToThemedString(pSteps->GetDifficulty()) );
|
||||||
g_StepsInformation.rows[difficulty].iDefaultChoice = pSteps->GetDifficulty();
|
g_StepsInformation.rows[difficulty].iDefaultChoice = pSteps->GetDifficulty();
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
@@ -1817,7 +1817,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
|
|||||||
ASSERT(0);
|
ASSERT(0);
|
||||||
}
|
}
|
||||||
g_StepsInformation.rows[meter].iDefaultChoice = clamp( pSteps->GetMeter()-1, 0, MAX_METER+1 );
|
g_StepsInformation.rows[meter].iDefaultChoice = clamp( pSteps->GetMeter()-1, 0, MAX_METER+1 );
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
g_StepsInformation.rows[meter].bEnabled = false;
|
g_StepsInformation.rows[meter].bEnabled = false;
|
||||||
@@ -1833,7 +1833,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
|
|||||||
g_StepsInformation.rows[predict_meter].choices[0] = ssprintf("%.2f",pSteps->PredictMeter());
|
g_StepsInformation.rows[predict_meter].choices[0] = ssprintf("%.2f",pSteps->PredictMeter());
|
||||||
g_StepsInformation.rows[description].choices.resize(1);
|
g_StepsInformation.rows[description].choices.resize(1);
|
||||||
g_StepsInformation.rows[description].choices[0] = pSteps->GetDescription();
|
g_StepsInformation.rows[description].choices[0] = pSteps->GetDescription();
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
@@ -1887,7 +1887,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
|
|||||||
pSteps->SetNoteData( m_NoteDataEdit );
|
pSteps->SetNoteData( m_NoteDataEdit );
|
||||||
pSteps->CalculateRadarValues( pSong->m_fMusicLengthSeconds );
|
pSteps->CalculateRadarValues( pSong->m_fMusicLengthSeconds );
|
||||||
|
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
{
|
{
|
||||||
@@ -2091,7 +2091,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
|
|||||||
PlayPreviewMusic();
|
PlayPreviewMusic();
|
||||||
break;
|
break;
|
||||||
case exit:
|
case exit:
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_FULL:
|
case EDIT_MODE_FULL:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
@@ -2730,7 +2730,7 @@ void ScreenEdit::CheckNumberOfNotesAndUndo()
|
|||||||
|
|
||||||
float ScreenEdit::GetMaximumBeatForNewNote() const
|
float ScreenEdit::GetMaximumBeatForNewNote() const
|
||||||
{
|
{
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_PRACTICE:
|
case EDIT_MODE_PRACTICE:
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ void DeleteCurSteps( void* pThrowAway )
|
|||||||
Song* pSong = GAMESTATE->m_pCurSong;
|
Song* pSong = GAMESTATE->m_pCurSong;
|
||||||
Steps* pStepsToDelete = GAMESTATE->m_pCurSteps[PLAYER_1];
|
Steps* pStepsToDelete = GAMESTATE->m_pCurSteps[PLAYER_1];
|
||||||
pSong->RemoveSteps( pStepsToDelete );
|
pSong->RemoveSteps( pStepsToDelete );
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
break;
|
break;
|
||||||
@@ -230,7 +230,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
|
|||||||
break;
|
break;
|
||||||
case EDIT_MENU_ACTION_DELETE:
|
case EDIT_MENU_ACTION_DELETE:
|
||||||
ASSERT( pSteps );
|
ASSERT( pSteps );
|
||||||
switch( EDIT_MODE )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
case EDIT_MODE_HOME:
|
case EDIT_MODE_HOME:
|
||||||
SCREENMAN->AddNewScreenToTop( "ScreenEditMenuDeleteSteps" );
|
SCREENMAN->AddNewScreenToTop( "ScreenEditMenuDeleteSteps" );
|
||||||
|
|||||||
Reference in New Issue
Block a user