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

const fixes

Browse Source
This commit is contained in:
Chris Danford
2004-11-06 21:32:28 +00:00
parent 6c855f0c93
commit 6a84b15d3d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteSkinManager.cpp
+8 -7
View File
@@ -140,7 +140,7 @@ void NoteSkinManager::GetNoteSkinNames( const Game* pGame, CStringArray &AddTo,
} }
bool NoteSkinManager::DoesNoteSkinExist( CString sSkinName ) bool NoteSkinManager::DoesNoteSkinExist( const CString &sSkinName )
{ {
CStringArray asSkinNames; CStringArray asSkinNames;
GetNoteSkinNames( asSkinNames ); GetNoteSkinNames( asSkinNames );
@@ -157,8 +157,9 @@ CString NoteSkinManager::GetNoteSkinDir( const CString &sSkinName )
return NOTESKINS_DIR + sGame + "/" + sSkinName + "/"; return NOTESKINS_DIR + sGame + "/" + sSkinName + "/";
} }
CString NoteSkinManager::GetMetric( CString sNoteSkinName, CString sButtonName, CString sValue ) CString NoteSkinManager::GetMetric( const CString &_sNoteSkinName, const CString &sButtonName, const CString &sValue )
{ {
CString sNoteSkinName = _sNoteSkinName;
sNoteSkinName.MakeLower(); sNoteSkinName.MakeLower();
map<CString,NoteSkinData>::const_iterator it = m_mapNameToData.find(sNoteSkinName); map<CString,NoteSkinData>::const_iterator it = m_mapNameToData.find(sNoteSkinName);
ASSERT_M( it != m_mapNameToData.end(), sNoteSkinName ); // this NoteSkin doesn't exist! ASSERT_M( it != m_mapNameToData.end(), sNoteSkinName ); // this NoteSkin doesn't exist!
@@ -173,22 +174,22 @@ CString NoteSkinManager::GetMetric( CString sNoteSkinName, CString sButtonName,
return sReturn; return sReturn;
} }
int NoteSkinManager::GetMetricI( CString sNoteSkinName, CString sButtonName, CString sValueName ) int NoteSkinManager::GetMetricI( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName )
{ {
return atoi( GetMetric(sNoteSkinName,sButtonName,sValueName) ); return atoi( GetMetric(sNoteSkinName,sButtonName,sValueName) );
} }
float NoteSkinManager::GetMetricF( CString sNoteSkinName, CString sButtonName, CString sValueName ) float NoteSkinManager::GetMetricF( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName )
{ {
return strtof( GetMetric(sNoteSkinName,sButtonName,sValueName), NULL ); return strtof( GetMetric(sNoteSkinName,sButtonName,sValueName), NULL );
} }
bool NoteSkinManager::GetMetricB( CString sNoteSkinName, CString sButtonName, CString sValueName ) bool NoteSkinManager::GetMetricB( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName )
{ {
return atoi( GetMetric(sNoteSkinName,sButtonName,sValueName) ) != 0; return atoi( GetMetric(sNoteSkinName,sButtonName,sValueName) ) != 0;
} }
RageColor NoteSkinManager::GetMetricC( CString sNoteSkinName, CString sButtonName, CString sValueName ) RageColor NoteSkinManager::GetMetricC( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName )
{ {
float r=1,b=1,g=1,a=1; // initialize in case sscanf fails float r=1,b=1,g=1,a=1; // initialize in case sscanf fails
CString sValue = GetMetric(sNoteSkinName,sButtonName,sValueName); CString sValue = GetMetric(sNoteSkinName,sButtonName,sValueName);
@@ -205,7 +206,7 @@ RageColor NoteSkinManager::GetMetricC( CString sNoteSkinName, CString sButtonNam
} }
CString NoteSkinManager::GetPathToFromNoteSkinAndButton( CString NoteSkin, CString sButtonName, CString sElement, bool bOptional ) CString NoteSkinManager::GetPathToFromNoteSkinAndButton( const CString &NoteSkin, const CString &sButtonName, const CString &sElement, bool bOptional )
{ {
try_again: try_again:
stepmania/src/NoteSkinManager.h
+7 -7
View File
@@ -18,15 +18,15 @@ public:
void RefreshNoteSkinData( const Game* game ); void RefreshNoteSkinData( const Game* game );
void GetNoteSkinNames( const Game* game, CStringArray &AddTo, bool bFilterDefault=true ); void GetNoteSkinNames( const Game* game, CStringArray &AddTo, bool bFilterDefault=true );
void GetNoteSkinNames( CStringArray &AddTo ); // looks up current const Game* in GAMESTATE void GetNoteSkinNames( CStringArray &AddTo ); // looks up current const Game* in GAMESTATE
bool DoesNoteSkinExist( CString sSkinName ); // looks up current const Game* in GAMESTATE bool DoesNoteSkinExist( const CString &sSkinName ); // looks up current const Game* in GAMESTATE
CString GetPathToFromNoteSkinAndButton( CString NoteSkin, CString sButtonName, CString sElement, bool bOptional=false ); CString GetPathToFromNoteSkinAndButton( const CString &sNoteSkin, const CString &sButtonName, const CString &sElement, bool bOptional=false );
CString GetMetric( CString sNoteSkinName, CString sButtonName, CString sValue ); CString GetMetric( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValue );
int GetMetricI( CString sNoteSkinName, CString sButtonName, CString sValueName ); int GetMetricI( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName );
float GetMetricF( CString sNoteSkinName, CString sButtonName, CString sValueName ); float GetMetricF( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName );
bool GetMetricB( CString sNoteSkinName, CString sButtonName, CString sValueName ); bool GetMetricB( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName );
RageColor GetMetricC( CString sNoteSkinName, CString sButtonName, CString sValueName ); RageColor GetMetricC( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName );
CString GetNoteSkinDir( const CString &sSkinName ); CString GetNoteSkinDir( const CString &sSkinName );