fix a crash on a course editor by renaming ambiguous class

This commit is contained in:
Thai Pangsakulyanont
2011-05-31 00:01:39 +07:00
parent 47cacfe865
commit f29e63d2b7
+3 -3
View File
@@ -24,7 +24,7 @@ static void GetStepsForSong( Song *pSong, vector<Steps*> &vpStepsOut )
} }
// XXX: very similar to OptionRowHandlerSteps // XXX: very similar to OptionRowHandlerSteps
class OptionRowHandlerSteps : public OptionRowHandler class EditCourseOptionRowHandlerSteps : public OptionRowHandler
{ {
public: public:
void Load( int iEntryIndex ) void Load( int iEntryIndex )
@@ -213,7 +213,7 @@ void ScreenOptionsEditCourse::BeginScreen()
} }
{ {
OptionRowHandlerSteps *pHand = new OptionRowHandlerSteps; EditCourseOptionRowHandlerSteps *pHand = new EditCourseOptionRowHandlerSteps;
pHand->Load( i ); pHand->Load( i );
pHand->m_Def.m_vsChoices.push_back( "n/a" ); pHand->m_Def.m_vsChoices.push_back( "n/a" );
pHand->m_Def.m_sName = ssprintf(STEPS.GetValue() + " %d",i+1); pHand->m_Def.m_sName = ssprintf(STEPS.GetValue() + " %d",i+1);
@@ -411,7 +411,7 @@ void ScreenOptionsEditCourse::SetCurrentSteps()
int iEntryIndex = RowToEntryIndex( iRow ); int iEntryIndex = RowToEntryIndex( iRow );
OptionRow &row = *m_pRows[ EntryIndexAndRowTypeToRow(iEntryIndex, RowType_Steps) ]; OptionRow &row = *m_pRows[ EntryIndexAndRowTypeToRow(iEntryIndex, RowType_Steps) ];
int iStepsIndex = row.GetOneSharedSelection(); int iStepsIndex = row.GetOneSharedSelection();
const OptionRowHandlerSteps *pHand = dynamic_cast<const OptionRowHandlerSteps *>( row.GetHandler() ); const EditCourseOptionRowHandlerSteps *pHand = dynamic_cast<const EditCourseOptionRowHandlerSteps *>( row.GetHandler() );
ASSERT( pHand ); ASSERT( pHand );
Steps *pSteps = pHand->GetSteps( iStepsIndex ); Steps *pSteps = pHand->GetSteps( iStepsIndex );
GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps ); GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps );