diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 9c01c1ec80..e747e5e94e 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -93,15 +93,11 @@ public: void CopyTweening( const Actor &from ); - CString m_sName, m_sID; + CString m_sName; - /* m_sName is the name actors use to look up internal metrics for themselves, and for - * filenames. m_sID is the name parents use to look up their own metrics for an actor - * (usually via ActorUtil). (This is experimental; see DifficultyMeter.cpp for more - * information.) */ const CString &GetName() const { return m_sName; } - const CString &GetID() const { return m_sID.empty() ? m_sName : m_sID; } - virtual void SetName( const CString &sName, const CString &sID = "" ) { m_sName = sName; m_sID = sID; } + const CString &GetID() const { return m_sName; } + virtual void SetName( const CString &sName ) { m_sName = sName; } diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp index df1e7da2b9..859f52a055 100644 --- a/stepmania/src/DifficultyList.cpp +++ b/stepmania/src/DifficultyList.cpp @@ -25,9 +25,9 @@ DifficultyList::~DifficultyList() { } -void DifficultyList::SetName( const CString &sName, const CString &sID ) +void DifficultyList::SetName( const CString &sName ) { - ActorFrame::SetName( sName, sID ); + ActorFrame::SetName( sName ); ITEMS_SPACING_Y.Load( m_sName, "ItemsSpacingY" ); NUM_SHOWN_ITEMS.Load( m_sName, "NumShownItems" ); diff --git a/stepmania/src/DifficultyList.h b/stepmania/src/DifficultyList.h index 39004ddddb..72309d1f54 100644 --- a/stepmania/src/DifficultyList.h +++ b/stepmania/src/DifficultyList.h @@ -16,7 +16,7 @@ class DifficultyList: public ActorFrame public: DifficultyList(); virtual ~DifficultyList(); - virtual void SetName( const CString &sName, const CString &sID = "" ); + virtual void SetName( const CString &sName ); void Load(); void SetFromGameState(); diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp index 85fc6ed634..e131252ac6 100644 --- a/stepmania/src/HelpDisplay.cpp +++ b/stepmania/src/HelpDisplay.cpp @@ -30,9 +30,9 @@ void HelpDisplay::LoadFromNode( const CString& sDir, const XNode* pNode ) BitmapText::LoadFromNode( sDir, pNode ); } -void HelpDisplay::SetName( const CString &sName, const CString &sID ) +void HelpDisplay::SetName( const CString &sName ) { - BitmapText::SetName( sName, sID ); + BitmapText::SetName( sName ); } void HelpDisplay::SetTips( const CStringArray &arrayTips, const CStringArray &arrayTipsAlt ) diff --git a/stepmania/src/HelpDisplay.h b/stepmania/src/HelpDisplay.h index 5531a59063..7e14ac899b 100644 --- a/stepmania/src/HelpDisplay.h +++ b/stepmania/src/HelpDisplay.h @@ -22,7 +22,7 @@ public: void GetTips( CStringArray &arrayTipsOut, CStringArray &arrayTipsAltOut ) const { arrayTipsOut = m_arrayTips; arrayTipsAltOut = m_arrayTipsAlt; } virtual void Update( float fDeltaTime ); - virtual void SetName( const CString &sName, const CString &sID = "" ); + virtual void SetName( const CString &sName ); // Lua virtual void PushSelf( lua_State *L );