diff --git a/stepmania/src/Preference.h b/stepmania/src/Preference.h index 8e9bb8a3a0..332ef0f4e4 100644 --- a/stepmania/src/Preference.h +++ b/stepmania/src/Preference.h @@ -89,26 +89,20 @@ template class Preference1D { typedef Preference PreferenceT; - typedef void (*pfn_t)(size_t, CString&, T&); vector m_v; - bool m_bInited; - pfn_t m_pFn; - size_t m_iNum; - void Init() +public: + Preference1D( void pfn(size_t i, CString &sNameOut, T &defaultValueOut ), size_t N ) { - for( size_t i=0; i(sName, defaultValue) ); } - m_bInited = true; } -public: - Preference1D( pfn_t pfn, size_t N) : m_bInited( false ), m_pFn( pfn ), m_iNum( N ) { } ~Preference1D() { for( size_t i=0; i& operator[]( size_t i ) const { - if( !m_bInited ) - Init(); return *m_v[i]; } Preference& operator[]( size_t i ) { - if( !m_bInited ) - Init(); return *m_v[i]; } };