From 87c9516cc0aedc21ed7d068a76a63ec528f49aad Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 Feb 2003 01:50:37 +0000 Subject: [PATCH] fix menu backgrounds in SMMAX2 --- stepmania/src/ThemeManager.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index dd107a6a07..fa25dba50f 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -118,7 +118,7 @@ CString ThemeManager::GetThemeDirFromName( const CString &sThemeName ) CString ThemeManager::GetPathTo( CString sThemeName, CString sAssetCategory, CString sFileName ) { -try_element_again: +// try_element_again: sAssetCategory.MakeLower(); sFileName.MakeLower(); @@ -163,7 +163,12 @@ try_element_again: sFileName = sNewFilePath; /* XXX check for loops */ - goto try_element_again; + /* Important: We need to do a full search. For example, BG redirs in + * the default theme point to "_shared background", and themes override + * just "_shared background"; the redirs in the default theme should end + * up resolving to the overridden background. */ + return GetPathTo(sAssetCategory, sFileName); +// goto try_element_again; } static const char *graphic_masks[] = {