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

fix pages being given default maps that they shouldn't have

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-09 02:59:15 +00:00
parent 82a2c657fd
commit 0a11fe26df
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Font.cpp
+8 -3
View File
@@ -642,12 +642,17 @@ void Font::LoadFontPageSettings(FontPageSettings &cfg, IniFile &ini, const CStri
* respectively. If it's anything else, we don't know what it * respectively. If it's anything else, we don't know what it
* is, so don't make any default mappings (the INI needs to do * is, so don't make any default mappings (the INI needs to do
* it itself). */ * it itself). */
if(cfg.CharToGlyphNo.empty() && NumFrames == 128) if( PageName != "common" && cfg.CharToGlyphNo.empty() )
{
if( NumFrames == 128 )
cfg.MapRange( "ascii", 0, 0, -1 ); cfg.MapRange( "ascii", 0, 0, -1 );
else if(cfg.CharToGlyphNo.empty() && NumFrames == 256) else if( NumFrames == 256 )
cfg.MapRange( "cp1252", 0, 0, -1 ); cfg.MapRange( "cp1252", 0, 0, -1 );
else if(cfg.CharToGlyphNo.empty() && NumFrames == 15) else if( NumFrames == 15 )
cfg.MapRange( "numbers", 0, 0, -1 ); cfg.MapRange( "numbers", 0, 0, -1 );
else
LOG->Trace( "Font page \"%s\" has no characters", TexturePath.c_str() );
}
/* If ' ' is set and nbsp is not, set nbsp. */ /* If ' ' is set and nbsp is not, set nbsp. */
if( cfg.CharToGlyphNo.find(' ') != cfg.CharToGlyphNo.end() ) if( cfg.CharToGlyphNo.find(' ') != cfg.CharToGlyphNo.end() )