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

throw if missing is also missing

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-24 00:32:33 +00:00
parent 75d27994f9
commit 689ea9cfe8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+7 -7
View File
@@ -175,12 +175,12 @@ try_element_again:
} }
static const char *graphic_masks[] = { static const char *graphic_masks[] = {
".sprite", ".png", ".jpg", ".bmp", ".gif", "*.sprite", "*.png", "*.jpg", "*.bmp", "*.gif",
".avi", ".mpg", ".mpeg", NULL "*.avi", "*.mpg", "*.mpeg", NULL
}; };
static const char *sound_masks[] = { ".set", ".mp3", ".ogg", ".wav", NULL }; static const char *sound_masks[] = { ".set", ".mp3", ".ogg", ".wav", NULL };
static const char *font_masks[] = { "*.ini", "*.png", "*.jpg", "*.bmp", "*.gif", NULL }; static const char *font_masks[] = { "*.ini", "*.png", "*.jpg", "*.bmp", "*.gif", NULL };
static const char *numbers_masks[] = { ".png", NULL }; static const char *numbers_masks[] = { "*.png", NULL };
static const char *bganimations_masks[] = { "", NULL }; static const char *bganimations_masks[] = { "", NULL };
static const char *blank_mask[] = { "", NULL }; static const char *blank_mask[] = { "", NULL };
const char **asset_masks = NULL; const char **asset_masks = NULL;
@@ -196,10 +196,6 @@ try_element_again:
if(sFileName.find_last_of('.') != sFileName.npos) if(sFileName.find_last_of('.') != sFileName.npos)
asset_masks = blank_mask; asset_masks = blank_mask;
/* Graphics can have hints, so add a wildcard. */
if( sAssetCategory == "graphics" || sAssetCategory == "numbers" )
sFileName += "*";
bool DirsOnly=false; bool DirsOnly=false;
if( sAssetCategory == "bganimations" ) if( sAssetCategory == "bganimations" )
DirsOnly=true; DirsOnly=true;
@@ -267,6 +263,10 @@ try_element_again:
sFileName.GetString(), sFileName.GetString(),
GetThemeDirFromName(m_sCurThemeName).GetString(), GetThemeDirFromName(m_sCurThemeName).GetString(),
GetThemeDirFromName(BASE_THEME_NAME).GetString() ); GetThemeDirFromName(BASE_THEME_NAME).GetString() );
/* Err? */
if(sFileName == "_missing")
RageException::Throw("_missing element missing from %s/%s", GetThemeDirFromName(BASE_THEME_NAME).GetString(), sAssetCategory.GetString() );
return GetPathTo( sAssetCategory, "_missing" ); return GetPathTo( sAssetCategory, "_missing" );
} }