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

add GetPathToOptional, so we can grab files and cope if they

Browse Source 
don't exist
This commit is contained in:
Glenn Maynard
2003-01-19 03:26:05 +00:00
parent 450618161c
commit a71d2ed254
2 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+45 -40
View File
@@ -206,12 +206,8 @@ try_element_again:
return asPossibleElementFilePaths[0];
}
CString ThemeManager::GetPathTo( CString sAssetCategory, CString sFileName )
CString ThemeManager::GetPathToOptional( CString sAssetCategory, CString sFileName )
{
if(sAssetCategory == "Fonts")
return GetPathToFont(sAssetCategory, sFileName);
try_element_again:
sAssetCategory.MakeLower();
sFileName.MakeLower();
@@ -265,36 +261,8 @@ try_element_again:
asPossibleElementFilePaths, false, true );
}
/* If it's empty, we found nothing. */
if( asPossibleElementFilePaths.empty() )
{
#ifdef _DEBUG
CString sMessage = ssprintf("The theme element %s/%s is missing.",sAssetCategory.GetString(),sFileName.GetString());
switch( MessageBox(NULL, sMessage, "ThemeManager", MB_ABORTRETRYIGNORE ) )
{
case IDRETRY:
goto try_element_again;
break;
case IDABORT:
#endif
RageException::Throw( "Theme element '%s/%s' could not be found in '%s' or '%s'.",
sAssetCategory.GetString(),
sFileName.GetString(),
GetThemeDirFromName(m_sCurThemeName).GetString(),
GetThemeDirFromName(BASE_THEME_NAME).GetString() );
#ifdef _DEBUG
case IDIGNORE:
LOG->Warn(
"Theme element '%s/%s' could not be found in '%s' or '%s'.",
sAssetCategory.GetString(),
sFileName.GetString(),
GetThemeDirFromName(m_sCurThemeName).GetString(),
GetThemeDirFromName(BASE_THEME_NAME).GetString() );
return GetPathTo( sAssetCategory, "_missing" );
break;
}
#endif
}
if(asPossibleElementFilePaths.empty())
return "";
if( asPossibleElementFilePaths[0].GetLength() > 5 && asPossibleElementFilePaths[0].Right(5) == "redir" ) // this is a redirect file
{
@@ -332,14 +300,51 @@ try_element_again:
goto try_element_again;
}
/* If we're searching for a font, the return value should be the file
* prefix we searched for; don't resolve it to the complete filename. */
if( sAssetCategory == "fonts" )
return path + sAssetCategory+"\\"+sFileName;
return asPossibleElementFilePaths[0];
}
CString ThemeManager::GetPathTo( CString sAssetCategory, CString sFileName )
{
if(sAssetCategory == "Fonts")
return GetPathToFont(sAssetCategory, sFileName);
#ifdef _DEBUG
try_element_again:
#endif
CString ret = GetPathToOptional(sAssetCategory, sFileName);
/* If it's empty, we found nothing. */
if( !ret.empty() )
return ret;
#ifdef _DEBUG
CString sMessage = ssprintf("The theme element %s/%s is missing.",sAssetCategory.GetString(),sFileName.GetString());
switch( MessageBox(NULL, sMessage, "ThemeManager", MB_ABORTRETRYIGNORE ) )
{
case IDRETRY:
goto try_element_again;
break;
case IDABORT:
#endif
RageException::Throw( "Theme element '%s/%s' could not be found in '%s' or '%s'.",
sAssetCategory.GetString(),
sFileName.GetString(),
GetThemeDirFromName(m_sCurThemeName).GetString(),
GetThemeDirFromName(BASE_THEME_NAME).GetString() );
#ifdef _DEBUG
case IDIGNORE:
LOG->Warn(
"Theme element '%s/%s' could not be found in '%s' or '%s'.",
sAssetCategory.GetString(),
sFileName.GetString(),
GetThemeDirFromName(m_sCurThemeName).GetString(),
GetThemeDirFromName(BASE_THEME_NAME).GetString() );
return GetPathTo( sAssetCategory, "_missing" );
}
#endif
}
CString ThemeManager::GetMetricsPathFromName( CString sThemeName )
{
stepmania/src/ThemeManager.h
+1
View File
@@ -29,6 +29,7 @@ public:
CString GetCurThemeName() { return m_sCurThemeName; };
CString GetPathTo( CString sAssetCategory, CString sFileName ); // looks up the current theme in PREFSMAN
CString GetPathToOptional( CString sAssetCategory, CString sFileName ); // looks up the current theme in PREFSMAN
CString GetMetric( CString sClassName, CString sValueName );
int GetMetricI( CString sClassName, CString sValueName );