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

remove m_sID

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-31 08:03:18 +00:00
parent f770ed29c6
commit d59d1c5d4c
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.h
+3 -7
View File
@@ -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; }
stepmania/src/DifficultyList.cpp
+2 -2
View File
@@ -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" );
stepmania/src/DifficultyList.h
+1 -1
View File
@@ -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();
stepmania/src/HelpDisplay.cpp
+2 -2
View File
@@ -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 )
stepmania/src/HelpDisplay.h
+1 -1
View File
@@ -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 );