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/CourseEntryDisplay.cpp
+5 -5
View File
@@ -49,12 +49,12 @@ void CourseEntryDisplay::Load()
if( !SEPARATE_COURSE_METERS && pn != GAMESTATE->m_MasterPlayerNumber )
continue; // skip
m_textFoot[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("FootP%i", pn+1):CString("Foot") );
m_textFoot[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("FootP%i", pn+1):RString("Foot") );
m_textFoot[pn].LoadFromTextureAndChars( THEME->GetPathF("CourseEntryDisplay","difficulty"),"10" );
SET_XY_AND_ON_COMMAND( &m_textFoot[pn] );
this->AddChild( &m_textFoot[pn] );
m_textDifficultyNumber[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("DifficultyP%i", pn+1):CString("Difficulty") );
m_textDifficultyNumber[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("DifficultyP%i", pn+1):RString("Difficulty") );
m_textDifficultyNumber[pn].LoadFromFont( THEME->GetPathF("Common","normal") );
SET_XY_AND_ON_COMMAND( &m_textDifficultyNumber[pn] );
this->AddChild( &m_textDifficultyNumber[pn] );
@@ -66,14 +66,14 @@ void CourseEntryDisplay::Load()
this->AddChild( &m_textModifiers );
}
void CourseEntryDisplay::LoadFromNode( const CString& sDir, const XNode* pNode )
void CourseEntryDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
{
ActorFrame::LoadFromNode( sDir, pNode );
Load();
}
void CourseEntryDisplay::SetDifficulty( PlayerNumber pn, const CString &text, Difficulty dc )
void CourseEntryDisplay::SetDifficulty( PlayerNumber pn, const RString &text, Difficulty dc )
{
if( !GAMESTATE->IsHumanPlayer(pn) )
return; // skip
@@ -135,7 +135,7 @@ void CourseEntryDisplay::SetFromGameState( int iCourseEntryIndex )
bool bLowIsSet = iLow != -1;
bool bHighIsSet = iHigh != -1;
CString s;
RString s;
if( !bLowIsSet && !bHighIsSet )
{
s = "?";