diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp index fd969c936a..5a692641a5 100644 --- a/stepmania/src/ScreenNetworkOptions.cpp +++ b/stepmania/src/ScreenNetworkOptions.cpp @@ -51,7 +51,7 @@ ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions g_NetworkOptionsLines[PO_SERVER].choices.push_back("Stop"); g_NetworkOptionsLines[PO_SERVER].choices.push_back("Start..."); - Init( + InitMenu( INPUTMODE_SHARE_CURSOR, g_NetworkOptionsLines, NUM_NETWORK_OPTIONS_LINES ); diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 2685b69121..b0a0b6c73e 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -129,7 +129,7 @@ void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText ) m_Rows[iRow]->m_OptionIcons[pn].Load( pn, sText, false ); } -void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOptionLines ) +void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNumOptionLines ) { LOG->Trace( "ScreenOptions::Set()" ); diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 2c07c9bd62..733eb165dd 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -42,7 +42,7 @@ class ScreenOptions : public ScreenWithMenuElements { public: ScreenOptions( CString sClassName ); - void Init( InputMode im, OptionRowData OptionRowData[], int iNumOptionLines ); + void InitMenu( InputMode im, OptionRowData OptionRowData[], int iNumOptionLines ); virtual ~ScreenOptions(); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 2a2d4afdd1..7468b09863 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -296,7 +296,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ): ASSERT( OptionRowHandlers.size() == asLineNames.size() ); - Init( im, m_OptionRowAlloc, asLineNames.size() ); + InitMenu( im, m_OptionRowAlloc, asLineNames.size() ); } ScreenOptionsMaster::~ScreenOptionsMaster() diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 6ee430618a..0a1290d489 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -67,7 +67,7 @@ ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions else g_ProfileOptionsLines[PO_OS_MOUNT_2].choices[0] = PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_2]; - Init( + InitMenu( INPUTMODE_SHARE_CURSOR, g_ProfileOptionsLines, NUM_PROFILE_OPTIONS_LINES );