actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove hack; no longer necessary

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-22 07:18:20 +00:00
parent ec69abca83
commit 305d9a86f5
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeMetric.h
+3 -17
View File
@@ -26,21 +26,15 @@ protected:
T m_currentValue; T m_currentValue;
bool m_bIsLoaded; bool m_bIsLoaded;
/* HACK: If true, reload the metric each time it's read. This is like DynamicThemeMetric,
* but works transparently for strings. This is very slow, and should be removed once
* metrics are refactored to fix DynamicThemeMetric. */
bool m_bAlwaysReload;
public: public:
/* Initializing with no group and name is allowed; if you do this, you must /* Initializing with no group and name is allowed; if you do this, you must
* call Load() to set them. This is done to allow initializing cached metrics * call Load() to set them. This is done to allow initializing cached metrics
* in one place for classes that don't receive their m_sName in the constructor * in one place for classes that don't receive their m_sName in the constructor
* (everything except screens). */ * (everything except screens). */
ThemeMetric( const RString& sGroup = "", const RString& sName = "", bool bAlwaysReload = false ): ThemeMetric( const RString& sGroup = "", const RString& sName = "" ):
m_sGroup( sGroup ), m_sGroup( sGroup ),
m_sName( sName ), m_sName( sName ),
m_bIsLoaded( false ), m_bIsLoaded( false )
m_bAlwaysReload( bAlwaysReload )
{ {
m_currentValue = T(); m_currentValue = T();
ThemeManager::Subscribe( this ); ThemeManager::Subscribe( this );
@@ -51,8 +45,7 @@ public:
m_sGroup( cpy.m_sGroup ), m_sGroup( cpy.m_sGroup ),
m_sName( cpy.m_sName ), m_sName( cpy.m_sName ),
m_currentValue( cpy.m_currentValue ), m_currentValue( cpy.m_currentValue ),
m_bIsLoaded( cpy.m_bIsLoaded ), m_bIsLoaded( cpy.m_bIsLoaded )
m_bAlwaysReload( cpy.m_bAlwaysReload )
{ {
ThemeManager::Subscribe( this ); ThemeManager::Subscribe( this );
} }
@@ -97,13 +90,6 @@ public:
{ {
ASSERT( m_sName != "" ); ASSERT( m_sName != "" );
ASSERT_M( m_bIsLoaded, m_sGroup + " " + m_sName ); ASSERT_M( m_bIsLoaded, m_sGroup + " " + m_sName );
if( m_bAlwaysReload )
{
ThemeMetric<T> *p = const_cast<ThemeMetric<T> *>(this);
p->Read();
}
return m_currentValue; return m_currentValue;
} }