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

don't use m_sID hackery

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-31 07:29:58 +00:00
parent c0d8400a6e
commit 934b176bda
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+9 -9
View File
@@ -14,10 +14,10 @@
#include "Foreach.h"
#include "PercentageDisplay.h"
#define SHIFT_X(p) THEME->GetMetricF(m_sName, ssprintf("ShiftP%iX", p+1))
#define SHIFT_Y(p) THEME->GetMetricF(m_sName, ssprintf("ShiftP%iY", p+1))
#define NUM_ITEM_COLORS(s) THEME->GetMetricI(m_sName, ssprintf("%sNumLevels",s))
#define ITEM_COLOR(s,n) THEME->GetMetric (m_sName, ssprintf("%sLevel%i",s,n+1))
#define SHIFT_X(p) THEME->GetMetricF(sType, ssprintf("ShiftP%iX", p+1))
#define SHIFT_Y(p) THEME->GetMetricF(sType, ssprintf("ShiftP%iY", p+1))
#define NUM_ITEM_COLORS(s) THEME->GetMetricI(sType, ssprintf("%sNumLevels",s))
#define ITEM_COLOR(s,n) THEME->GetMetric (sType, ssprintf("%sLevel%i",s,n+1))
enum { NEED_NOTES=1, NEED_COURSE=2, NEED_PROFILE=4 };
struct Content_t
@@ -77,13 +77,13 @@ PaneDisplay::PaneDisplay()
m_CurPane = PANE_INVALID;
}
void PaneDisplay::Load( PlayerNumber pn )
void PaneDisplay::Load( const CString &sType, PlayerNumber pn )
{
m_PlayerNumber = pn;
m_sprPaneUnder.Load( THEME->GetPathG("PaneDisplay",ssprintf("under p%i",pn+1)) );
m_sprPaneUnder->SetName( "Under" );
ON_COMMAND( m_sprPaneUnder );
ActorUtil::OnCommand( m_sprPaneUnder, sType );
this->AddChild( m_sprPaneUnder );
FOREACH_PaneContents(p)
@@ -127,12 +127,12 @@ void PaneDisplay::Load( PlayerNumber pn )
m_textContents[p].LoadFromFont( THEME->GetPathF("PaneDisplay","text") );
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
SET_XY_AND_ON_COMMAND( m_textContents[p] );
ActorUtil::SetXYAndOnCommand( m_textContents[p], sType );
m_ContentsFrame.AddChild( &m_textContents[p] );
m_Labels[p].Load( THEME->GetPathG("PaneDisplay",CString(g_Contents[p].name)+" label") );
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
SET_XY_AND_ON_COMMAND( m_Labels[p] );
ActorUtil::SetXYAndOnCommand( m_Labels[p], sType );
m_ContentsFrame.AddChild( m_Labels[p] );
}
@@ -141,7 +141,7 @@ void PaneDisplay::Load( PlayerNumber pn )
m_sprPaneOver.Load( THEME->GetPathG("PaneDisplay",ssprintf("over p%i", pn+1)) );
m_sprPaneOver->SetName( "Over" );
ON_COMMAND( m_sprPaneOver );
ActorUtil::OnCommand( m_sprPaneOver, sType );
this->AddChild( m_sprPaneOver );
for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i )
stepmania/src/PaneDisplay.h
+1 -1
View File
@@ -63,7 +63,7 @@ class PaneDisplay: public ActorFrame
public:
PaneDisplay();
void Load( PlayerNumber pn );
void Load( const CString &sClass, PlayerNumber pn );
void SetFromGameState( SortOrder so );
void Update( float fDeltaTime );
stepmania/src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -276,8 +276,8 @@ void ScreenSelectMusic::Init()
if( SHOW_PANES )
{
m_PaneDisplay[p].SetName( "PaneDisplay", ssprintf("PaneDisplayP%d",p+1) );
m_PaneDisplay[p].Load( p );
m_PaneDisplay[p].SetName( ssprintf("PaneDisplayP%d",p+1) );
m_PaneDisplay[p].Load( "PaneDisplay", p );
SET_XY( m_PaneDisplay[p] );
this->AddChild( &m_PaneDisplay[p] );
}