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

rename new GetPathTo -> GetPath to avoid overload problems

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-14 01:16:04 +00:00
parent ffb841ba38
commit ebd948988d
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+1 -1
View File
@@ -168,7 +168,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
* music, it will constantly loop even after the screen has gone on * music, it will constantly loop even after the screen has gone on
* to the next attract screen. -- Miryokuteki */ * to the next attract screen. -- Miryokuteki */
bool bGoingToPlayTheSameMusic = bool bGoingToPlayTheSameMusic =
THEME->GetPathToS( NEXT_SCREEN, "music", false) == THEME->GetPathToS( m_sName, "music", false); THEME->GetPathS( NEXT_SCREEN, "music", false) == THEME->GetPathS( m_sName, "music", false);
if( bGoingToPlayTheSameMusic ) if( bGoingToPlayTheSameMusic )
; // do nothing ; // do nothing
else else
stepmania/src/ScreenSelect.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
mc.Load( c, sChoice ); mc.Load( c, sChoice );
m_aModeChoices.push_back( mc ); m_aModeChoices.push_back( mc );
CString sBGAnimationDir = THEME->GetPathTo(BGAnimations, m_sName, mc.m_sName, true); // true="optional" CString sBGAnimationDir = THEME->GetPath(BGAnimations, m_sName, mc.m_sName, true); // true="optional"
if( sBGAnimationDir == "" ) if( sBGAnimationDir == "" )
sBGAnimationDir = THEME->GetPathToB(m_sName+" background"); sBGAnimationDir = THEME->GetPathToB(m_sName+" background");
BGAnimation *pBGA = new BGAnimation; BGAnimation *pBGA = new BGAnimation;
stepmania/src/SongCreditDisplay.cpp
+2 -1
View File
@@ -18,9 +18,10 @@
SongCreditDisplay::SongCreditDisplay() SongCreditDisplay::SongCreditDisplay()
{ {
this->LoadFromFont( THEME->GetPathToF("SongCreditDisplay",(CString)"text") );
if( GAMESTATE->IsCourseMode() ) if( GAMESTATE->IsCourseMode() )
return; return;
this->LoadFromFont( THEME->GetPathF("SongCreditDisplay","text") );
Song* pSong = GAMESTATE->m_pCurSong; Song* pSong = GAMESTATE->m_pCurSong;
ASSERT( pSong ); ASSERT( pSong );
stepmania/src/ThemeManager.cpp
+9 -9
View File
@@ -342,7 +342,7 @@ try_element_again:
* up resolving to the overridden background. */ * up resolving to the overridden background. */
/* Use GetPathToOptional because we don't want report that there's an element /* Use GetPathToOptional because we don't want report that there's an element
* missing. Instead we want to report that the redirect is invalid. */ * missing. Instead we want to report that the redirect is invalid. */
CString sNewPath = GetPathTo(category, sNewClassName, sNewFile, true); CString sNewPath = GetPath(category, sNewClassName, sNewFile, true);
if( !sNewPath.empty() ) if( !sNewPath.empty() )
return sNewPath; return sNewPath;
@@ -365,7 +365,7 @@ try_element_again:
} }
} }
CString ThemeManager::GetPathTo( ElementCategory category, CString sClassName, CString sElement, bool bOptional ) CString ThemeManager::GetPath( ElementCategory category, CString sClassName, CString sElement, bool bOptional )
{ {
CString sFileName = ClassAndElementToFileName( sClassName, sElement ); CString sFileName = ClassAndElementToFileName( sClassName, sElement );
@@ -430,7 +430,7 @@ try_element_again:
if(sFileName == "_missing") if(sFileName == "_missing")
RageException::Throw("'_missing' isn't present in '%s%s'", GetThemeDirFromName(BASE_THEME_NAME).c_str(), sCategory.c_str() ); RageException::Throw("'_missing' isn't present in '%s%s'", GetThemeDirFromName(BASE_THEME_NAME).c_str(), sCategory.c_str() );
Cache[sFileName] = GetPathTo( category, "", "_missing" ); Cache[sFileName] = GetPath( category, "", "_missing" );
return Cache[sFileName]; return Cache[sFileName];
/* XXX: "abort" and "cancel" are synonyms; merge */ /* XXX: "abort" and "cancel" are synonyms; merge */
case ArchHooks::abort: case ArchHooks::abort:
@@ -599,9 +599,9 @@ CString ThemeManager::GetLanguageIniPath( CString sThemeName, CString sLanguage
} }
// TODO: remove these and update the places that use them // TODO: remove these and update the places that use them
CString ThemeManager::GetPathToB( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToB(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToB( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathB(sClassName,sElement,bOptional); }
CString ThemeManager::GetPathToF( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToF(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToF( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathF(sClassName,sElement,bOptional); }
CString ThemeManager::GetPathToG( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToG(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToG( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathG(sClassName,sElement,bOptional); }
CString ThemeManager::GetPathToN( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToN(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToN( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathN(sClassName,sElement,bOptional); }
CString ThemeManager::GetPathToS( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToS(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToS( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathS(sClassName,sElement,bOptional); }
CString ThemeManager::GetPathToO( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToO(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToO( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathO(sClassName,sElement,bOptional); }
stepmania/src/ThemeManager.h
+10 -7
View File
@@ -37,13 +37,16 @@ public:
void ReloadMetrics(); void ReloadMetrics();
void ReloadMetricsIfNecessary(); void ReloadMetricsIfNecessary();
CString GetPathTo( ElementCategory category, CString sClassName, CString sElement, bool bOptional=false ); /* I renamed these for two reasons. The overload conflicts with the ones below:
CString GetPathToB( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(BGAnimations,sClassName,sElement,bOptional); }; * GetPathToB( str, str ) was matching the ones below instead of these. It's also
CString GetPathToF( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Fonts,sClassName,sElement,bOptional); }; * easier to search for uses of obsolete functions if they have a different name. */
CString GetPathToG( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Graphics,sClassName,sElement,bOptional); }; CString GetPath( ElementCategory category, CString sClassName, CString sElement, bool bOptional=false );
CString GetPathToN( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Numbers,sClassName,sElement,bOptional); }; CString GetPathB( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(BGAnimations,sClassName,sElement,bOptional); };
CString GetPathToS( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Sounds,sClassName,sElement,bOptional); }; CString GetPathF( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Fonts,sClassName,sElement,bOptional); };
CString GetPathToO( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Other,sClassName,sElement,bOptional); }; CString GetPathG( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Graphics,sClassName,sElement,bOptional); };
CString GetPathN( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Numbers,sClassName,sElement,bOptional); };
CString GetPathS( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Sounds,sClassName,sElement,bOptional); };
CString GetPathO( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Other,sClassName,sElement,bOptional); };
// TODO: remove these and update the places that use them // TODO: remove these and update the places that use them
CString GetPathToB( CString sFileName, bool bOptional=false ); CString GetPathToB( CString sFileName, bool bOptional=false );