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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-11-01 15:00:50 +00:00
parent c0094aecbf
commit cbce8648e7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Font.cpp
+7 -9
View File
@@ -653,18 +653,16 @@ void Font::Load( const CString &sIniPath, CString sChars )
ASSERT_M( !GetExtension(sIniPath).CompareNoCase("ini"), sIniPath ); ASSERT_M( !GetExtension(sIniPath).CompareNoCase("ini"), sIniPath );
/* Check for recursion (recursive imports). */ /* Check for recursion (recursive imports). */
for( unsigned i = 0; i < LoadStack.size(); ++i )
{ {
for(unsigned i = 0; i < LoadStack.size(); ++i) if( LoadStack[i] == sIniPath )
{ {
if( LoadStack[i] == sIniPath ) CString str = join("\n", LoadStack);
{ str += "\n" + sIniPath;
CString str = join("\n", LoadStack); RageException::Throw("Font import recursion detected\n%s", str.c_str());
str += "\n" + sIniPath;
RageException::Throw("Font import recursion detected\n%s", str.c_str());
}
} }
LoadStack.push_back( sIniPath );
} }
LoadStack.push_back( sIniPath );
/* The font is not already loaded. Figure out what we have. */ /* The font is not already loaded. Figure out what we have. */
CHECKPOINT_M( ssprintf("Font::Load(\"%s\",\"%s\").", sIniPath.c_str(), m_sChars.c_str()) ); CHECKPOINT_M( ssprintf("Font::Load(\"%s\",\"%s\").", sIniPath.c_str(), m_sChars.c_str()) );
@@ -716,7 +714,7 @@ void Font::Load( const CString &sIniPath, CString sChars )
} }
/* Load each font page. */ /* Load each font page. */
for(unsigned i = 0; i < asTexturePaths.size(); ++i) for( unsigned i = 0; i < asTexturePaths.size(); ++i )
{ {
const CString &sTexturePath = asTexturePaths[i]; const CString &sTexturePath = asTexturePaths[i];