diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp index 989dd7a19a..f89c320b2b 100644 --- a/stepmania/src/Preference.cpp +++ b/stepmania/src/Preference.cpp @@ -81,14 +81,6 @@ void IPreference::SetFromStack( lua_State *L ) template<> void PrefFromString( const RString &s, type &v ) \ { \ ::FromString( s, v ); \ - } \ - template<> void PrefSetFromStack( lua_State *L, type &v ) \ - { \ - LuaHelpers::Pop( L, v ); \ - } \ - template<> void PrefPushValue( lua_State *L, const type &v ) \ - { \ - LuaHelpers::Push( L, v ); \ } READFROM_AND_WRITETO( int ) diff --git a/stepmania/src/Preference.h b/stepmania/src/Preference.h index 683c5c674e..3e6a6c86c3 100644 --- a/stepmania/src/Preference.h +++ b/stepmania/src/Preference.h @@ -46,8 +46,6 @@ void BroadcastPreferenceChanged( const RString& sPreferenceName ); template RString PrefToString( const BasicType &v ); template void PrefFromString( const RString &s, BasicType &v ); -template void PrefSetFromStack( lua_State *L, BasicType &v ); -template void PrefPushValue( lua_State *L, const BasicType &v ); template class Preference : public IPreference @@ -71,13 +69,13 @@ public: } void SetFromStack( lua_State *L ) { - PrefSetFromStack( L, (BasicType &)m_currentValue ); + LuaHelpers::Pop( L, (BasicType &)m_currentValue ); if( m_pfnValidate ) m_pfnValidate( m_currentValue ); } void PushValue( lua_State *L ) const { - PrefPushValue( L, m_currentValue ); + LuaHelpers::Push( L, m_currentValue ); } void LoadDefault()