Browse Source

allow using wor16.asc/wor16.fon with win95 version (useful for Traditional Chinese users).

Wei Mingzhi 6 years ago
parent
commit
32b6ad8e02
1 changed files with 13 additions and 14 deletions
  1. 13 14
      font.c

+ 13 - 14
font.c

@@ -184,7 +184,6 @@ static void PAL_LoadEmbeddedFont(void)
 
 	fclose(fp);
 
-	PAL_LoadISOFont();
 	_font_height = 15;
 }
 
@@ -359,22 +358,22 @@ PAL_InitFont(
 	const CONFIGURATION* cfg
 )
 {
-	if (!cfg->fIsWIN95 && !cfg->pszMsgFile)
-	{
-		PAL_LoadEmbeddedFont();
-	}
+   if (!cfg->pszMsgFile)
+   {
+      PAL_LoadEmbeddedFont();
+   }
 
-	if (g_TextLib.fUseISOFont)
-	{
-		PAL_LoadISOFont();
-	}
+   if (g_TextLib.fUseISOFont)
+   {
+      PAL_LoadISOFont();
+   }
 
-	if (cfg->pszFontFile)
-	{
-		PAL_LoadUserFont(cfg->pszFontFile);
-	}
+   if (cfg->pszFontFile)
+   {
+      PAL_LoadUserFont(cfg->pszFontFile);
+   }
 
-	return 0;
+   return 0;
 }
 
 void