move m_OptionsNavigation init to ctor

This commit is contained in:
Glenn Maynard
2005-07-15 02:25:09 +00:00
parent 9e9221609f
commit 5c7fb961e4
+3 -2
View File
@@ -96,6 +96,9 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
{ {
m_fLockInputSecs = 0.0001f; // always lock for a tiny amount of time so that we throw away any queued inputs during the load. m_fLockInputSecs = 0.0001f; // always lock for a tiny amount of time so that we throw away any queued inputs during the load.
// This can be overridden in a derived Init().
m_OptionsNavigation = PREFSMAN->m_bArcadeOptionsNavigation? NAV_THREE_KEY:NAV_FIVE_KEY;
LOG->Trace( "ScreenOptions::ScreenOptions()" ); LOG->Trace( "ScreenOptions::ScreenOptions()" );
} }
@@ -104,8 +107,6 @@ void ScreenOptions::Init()
{ {
ScreenWithMenuElements::Init(); ScreenWithMenuElements::Init();
m_OptionsNavigation = PREFSMAN->m_bArcadeOptionsNavigation? NAV_THREE_KEY:NAV_FIVE_KEY;
m_SoundChangeCol.Load( THEME->GetPathS(m_sName,"change"), true ); m_SoundChangeCol.Load( THEME->GetPathS(m_sName,"change"), true );
m_SoundNextRow.Load( THEME->GetPathS(m_sName,"next"), true ); m_SoundNextRow.Load( THEME->GetPathS(m_sName,"next"), true );
m_SoundPrevRow.Load( THEME->GetPathS(m_sName,"prev"), true ); m_SoundPrevRow.Load( THEME->GetPathS(m_sName,"prev"), true );