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

CString -> RString

Browse Source
This commit is contained in:
Chris Danford
2006-01-22 01:00:06 +00:00
parent 870ed267fc
commit 7f821e8cfc
578 changed files with 3943 additions and 3946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+6 -6
View File
@@ -56,7 +56,7 @@ PaneDisplay::PaneDisplay()
m_CurPane = PANE_INVALID;
}
void PaneDisplay::Load( const CString &sMetricsGroup, PlayerNumber pn )
void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
{
m_PlayerNumber = pn;
@@ -79,7 +79,7 @@ void PaneDisplay::Load( const CString &sMetricsGroup, PlayerNumber pn )
ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup, this );
m_ContentsFrame.AddChild( &m_textContents[p] );
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,CString(g_Contents[p].name)+" label") );
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") );
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup, this );
m_ContentsFrame.AddChild( m_Labels[p] );
@@ -101,17 +101,17 @@ void PaneDisplay::Load( const CString &sMetricsGroup, PlayerNumber pn )
m_CurPane = PANE_INVALID;
}
void PaneDisplay::LoadFromNode( const CString &sDir, const XNode *pNode )
void PaneDisplay::LoadFromNode( const RString &sDir, const XNode *pNode )
{
ActorFrame::LoadFromNode( sDir, pNode );
bool b;
CString sMetricsGroup;
RString sMetricsGroup;
b = pNode->GetAttrValue( "MetricsGroup", sMetricsGroup );
ASSERT( b );
CString sPlayerNumber;
RString sPlayerNumber;
b = pNode->GetAttrValue( "PlayerNumber", sPlayerNumber );
ASSERT( b );
PlayerNumber pn = (PlayerNumber) LuaHelpers::RunExpressionI(sPlayerNumber);
@@ -121,7 +121,7 @@ void PaneDisplay::LoadFromNode( const CString &sDir, const XNode *pNode )
void PaneDisplay::SetContent( PaneContents c )
{
CString str = "?"; // fill this in
RString str = "?"; // fill this in
float val = 0; // fill this in
const Song *pSong = GAMESTATE->m_pCurSong;