Missing theme elements is not longer fatal
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
need this here for CVS...
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
@@ -162,14 +162,30 @@ try_element_again:
|
|||||||
if( asPossibleElementFilePaths.GetSize() == 0 )
|
if( asPossibleElementFilePaths.GetSize() == 0 )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
if( IDRETRY == AfxMessageBox( ssprintf("The theme element %s/%s is missing. Correct this and click Retry, or Cancel to break.",sAssetCategory,sFileName), MB_RETRYCANCEL ) )
|
switch( AfxMessageBox( ssprintf("The theme element %s/%s is missing.",sAssetCategory,sFileName), MB_ABORTRETRYIGNORE ) )
|
||||||
|
{
|
||||||
|
case IDRETRY:
|
||||||
goto try_element_again;
|
goto try_element_again;
|
||||||
|
break;
|
||||||
|
case IDABORT:
|
||||||
|
#endif
|
||||||
|
throw RageException( "Theme element '%s/%s' could not be found in '%s' or '%s'.",
|
||||||
|
sAssetCategory,
|
||||||
|
sFileName,
|
||||||
|
GetThemeDirFromName(m_sCurThemeName),
|
||||||
|
GetThemeDirFromName(BASE_THEME_NAME) );
|
||||||
|
#ifdef _DEBUG
|
||||||
|
case IDIGNORE:
|
||||||
|
LOG->Warn(
|
||||||
|
"Theme element '%s/%s' could not be found in '%s' or '%s'.",
|
||||||
|
sAssetCategory,
|
||||||
|
sFileName,
|
||||||
|
GetThemeDirFromName(m_sCurThemeName),
|
||||||
|
GetThemeDirFromName(BASE_THEME_NAME) );
|
||||||
|
return GetPathTo( sAssetCategory, "_missing" );
|
||||||
|
break;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
throw RageException( "Theme element '%s/%s' could not be found in '%s' or '%s'.",
|
|
||||||
sAssetCategory,
|
|
||||||
sFileName,
|
|
||||||
GetThemeDirFromName(m_sCurThemeName),
|
|
||||||
GetThemeDirFromName(BASE_THEME_NAME) );
|
|
||||||
}
|
}
|
||||||
asPossibleElementFilePaths[0].MakeLower();
|
asPossibleElementFilePaths[0].MakeLower();
|
||||||
if( asPossibleElementFilePaths[0].GetLength() > 5 && asPossibleElementFilePaths[0].Right(5) == "redir" ) // this is a redirect file
|
if( asPossibleElementFilePaths[0].GetLength() > 5 && asPossibleElementFilePaths[0].Right(5) == "redir" ) // this is a redirect file
|
||||||
|
|||||||
Reference in New Issue
Block a user