From 0a11fe26dffa2eee05e1aa711fc6921a817a271a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Sep 2004 02:59:15 +0000 Subject: [PATCH] fix pages being given default maps that they shouldn't have --- stepmania/src/Font.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp index d8c809c4eb..c784cd8b04 100644 --- a/stepmania/src/Font.cpp +++ b/stepmania/src/Font.cpp @@ -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 * is, so don't make any default mappings (the INI needs to do * it itself). */ - if(cfg.CharToGlyphNo.empty() && NumFrames == 128) - cfg.MapRange("ascii", 0, 0, -1); - else if(cfg.CharToGlyphNo.empty() && NumFrames == 256) - cfg.MapRange("cp1252", 0, 0, -1); - else if(cfg.CharToGlyphNo.empty() && NumFrames == 15) - cfg.MapRange("numbers", 0, 0, -1); + if( PageName != "common" && cfg.CharToGlyphNo.empty() ) + { + if( NumFrames == 128 ) + cfg.MapRange( "ascii", 0, 0, -1 ); + else if( NumFrames == 256 ) + cfg.MapRange( "cp1252", 0, 0, -1 ); + else if( NumFrames == 15 ) + 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( cfg.CharToGlyphNo.find(' ') != cfg.CharToGlyphNo.end() )