From ed6dc58f6765b8f1905813eb9e0b3f94313b6a2e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 30 Sep 2002 06:32:56 +0000 Subject: [PATCH] Missing theme elements is not longer fatal --- .../default/BGAnimations/_missing/dummy.txt | 1 + .../Themes/default/Graphics/_missing.png | Bin 0 -> 6516 bytes stepmania/src/ThemeManager.cpp | 28 ++++++++++++++---- 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/_missing/dummy.txt create mode 100644 stepmania/Themes/default/Graphics/_missing.png diff --git a/stepmania/Themes/default/BGAnimations/_missing/dummy.txt b/stepmania/Themes/default/BGAnimations/_missing/dummy.txt new file mode 100644 index 0000000000..73b377907b --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/_missing/dummy.txt @@ -0,0 +1 @@ +need this here for CVS... \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/_missing.png b/stepmania/Themes/default/Graphics/_missing.png new file mode 100644 index 0000000000000000000000000000000000000000..922995110af9ab0bd5fe99a3895bb4659d002d6c GIT binary patch literal 6516 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 M^a~Q7_le2>KU)98zW@LL literal 0 HcmV?d00001 diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 413a27900c..cd62134fed 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -162,14 +162,30 @@ try_element_again: if( asPossibleElementFilePaths.GetSize() == 0 ) { #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; + 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 - 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(); if( asPossibleElementFilePaths[0].GetLength() > 5 && asPossibleElementFilePaths[0].Right(5) == "redir" ) // this is a redirect file