Don't grayscale fonts by default.

Load properties common to all font pages from the section "common".
This commit is contained in:
Glenn Maynard
2003-10-08 23:18:56 +00:00
parent bd70198bee
commit 4ae167bf9e
+2 -5
View File
@@ -42,11 +42,7 @@ void FontPage::Load( FontPageSettings cfg )
if( cfg.TextureHints != "default" ) if( cfg.TextureHints != "default" )
ID.AdditionalTextureHints = cfg.TextureHints; ID.AdditionalTextureHints = cfg.TextureHints;
else else
{ ID.AdditionalTextureHints = "16bpp";
/* Using grayscale and 16bpp together means to use a 16bpp image if a grayscale
* image couldn't be loaded. */
ID.AdditionalTextureHints = "grayscale 16bpp";
}
m_pTexture = TEXTUREMAN->LoadTexture( ID ); m_pTexture = TEXTUREMAN->LoadTexture( ID );
ASSERT( m_pTexture != NULL ); ASSERT( m_pTexture != NULL );
@@ -820,6 +816,7 @@ void Font::Load(const CString &sFontOrTextureFilePath, CString sChars)
/* Load settings for this page from the INI. */ /* Load settings for this page from the INI. */
FontPageSettings cfg; FontPageSettings cfg;
LoadFontPageSettings(cfg, ini, TexturePaths[i], "common", sChars);
LoadFontPageSettings(cfg, ini, TexturePaths[i], pagename, sChars); LoadFontPageSettings(cfg, ini, TexturePaths[i], pagename, sChars);
/* Go. */ /* Go. */