From 1efc1f732c75ffc26a7efb8f342986ce83bea5af Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Jul 2004 23:26:34 +0000 Subject: [PATCH] eliminate GetPathToN/GetPathN --- stepmania/src/ThemeManager.cpp | 7 +++---- stepmania/src/ThemeManager.h | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 86fc25e47c..997aaa15fe 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -285,9 +285,9 @@ try_element_again: if( asElementPaths.size() == 0 ) { - // HACK: have Numbers fall back to fonts. Eventually Numbers will be removed. - if( category == Numbers ) - return GetPathToRaw( sThemeName, Fonts, sClassName, sElement ) ; + // HACK: have Fonts fall back to Numbers. Eventually Numbers will be removed. + if( category == Fonts ) + return GetPathToRaw( sThemeName, Numbers, sClassName, sElement ) ; return ""; // This isn't fatal. } @@ -625,7 +625,6 @@ CString ThemeManager::GetLanguageIniPath( CString sThemeName, CString sLanguage 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 GetPathF(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 GetPathN(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 GetPathO(sClassName,sElement,bOptional); } diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h index 8262f3b88d..e1a1cb1976 100644 --- a/stepmania/src/ThemeManager.h +++ b/stepmania/src/ThemeManager.h @@ -36,7 +36,6 @@ public: CString GetPathB( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(BGAnimations,sClassName,sElement,bOptional); }; CString GetPathF( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Fonts,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); }; @@ -44,7 +43,6 @@ public: CString GetPathToB( CString sFileName, bool bOptional=false ); CString GetPathToF( CString sFileName, bool bOptional=false ); CString GetPathToG( CString sFileName, bool bOptional=false ); - CString GetPathToN( CString sFileName, bool bOptional=false ); CString GetPathToS( CString sFileName, bool bOptional=false ); CString GetPathToO( CString sFileName, bool bOptional=false );