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/HelpDisplay.cpp
+10 -10
View File
@@ -13,7 +13,7 @@ HelpDisplay::HelpDisplay()
m_fSecsUntilSwitch = 0;
}
void HelpDisplay::Load( const CString &sType )
void HelpDisplay::Load( const RString &sType )
{
TIP_SHOW_TIME.Load( sType, "TipShowTime" );
@@ -24,17 +24,17 @@ void HelpDisplay::Load( const CString &sType )
m_fSecsUntilSwitch = TIP_SHOW_TIME;
}
void HelpDisplay::LoadFromNode( const CString& sDir, const XNode* pNode )
void HelpDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
{
BitmapText::LoadFromNode( sDir, pNode );
}
void HelpDisplay::SetName( const CString &sName )
void HelpDisplay::SetName( const RString &sName )
{
BitmapText::SetName( sName );
}
void HelpDisplay::SetTips( const vector<CString> &arrayTips, const vector<CString> &arrayTipsAlt )
void HelpDisplay::SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt )
{
ASSERT( arrayTips.size() == arrayTipsAlt.size() );
@@ -84,14 +84,14 @@ public:
{
luaL_checktype( L, 1, LUA_TTABLE );
lua_pushvalue( L, 1 );
vector<CString> arrayTips;
vector<RString> arrayTips;
LuaHelpers::ReadArrayFromTable( arrayTips, L );
lua_pop( L, 1 );
for( unsigned i = 0; i < arrayTips.size(); ++i )
FontCharAliases::ReplaceMarkers( arrayTips[i] );
if( lua_gettop(L) > 1 && !lua_isnil( L, 2 ) )
{
vector<CString> arrayTipsAlt;
vector<RString> arrayTipsAlt;
luaL_checktype( L, 2, LUA_TTABLE );
lua_pushvalue( L, 2 );
LuaHelpers::ReadArrayFromTable( arrayTipsAlt, L );
@@ -109,7 +109,7 @@ public:
static int gettips( T* p, lua_State *L )
{
vector<CString> arrayTips, arrayTipsAlt;
vector<RString> arrayTips, arrayTipsAlt;
p->GetTips( arrayTips, arrayTipsAlt );
LuaHelpers::CreateTableFromArray( arrayTips, L );
@@ -148,11 +148,11 @@ GenreDisplay::~GenreDisplay()
{
}
void GenreDisplay::PlayCommand( const CString &sCommandName, Actor* pParent )
void GenreDisplay::PlayCommand( const RString &sCommandName, Actor* pParent )
{
if( sCommandName == MessageToString(Message_CurrentSongChanged) )
{
vector<CString> m_Artists, m_AltArtists;
vector<RString> m_Artists, m_AltArtists;
Song* pSong = GAMESTATE->m_pCurSong;
ASSERT( pSong );
@@ -164,7 +164,7 @@ void GenreDisplay::PlayCommand( const CString &sCommandName, Actor* pParent )
}
else if( sCommandName == MessageToString(Message_CurrentCourseChanged) )
{
vector<CString> m_Artists, m_AltArtists;
vector<RString> m_Artists, m_AltArtists;
Course* pCourse = GAMESTATE->m_pCurCourse;
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;