Merge remote-tracking branch 'upstream/master'

source/core/razefont.cpp

@@ -54,16 +54,9 @@ CUSTOM_CVAR(Int, duke_menufont, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
 {
 	if (!(g_gameType & GAMEFLAG_DUKE) || !BigFont13 || !BigFont15) return;
 	if (self < -1 || self > 1) self = -1;
-	else
-	{
-		// BigFont15 is Latin only, so for non-latin languages force BigFont13 until someone completes this font. (This lists all relevant European languages, regardless of support!)
-		if (!strnicmp(language, "ru", 2) || !strnicmp(language, "sr", 2) || !strnicmp(language, "bg", 2) || !strnicmp(language, "mk", 2)  || !strnicmp(language, "uk", 2) || !strnicmp(language, "el", 2))
-			OriginalBigFont->CopyFrom(*BigFont13);
-		
-		// Font info must be copied so that BigFont does not change its address.
-		else if (self == 0 || (self == -1 && isPlutoPak())) OriginalBigFont->CopyFrom(*BigFont15);
-		else if (self == 1 || (self == -1 && !isPlutoPak())) OriginalBigFont->CopyFrom(*BigFont13);
-	}
+	// Font info must be copied so that BigFont does not change its address.
+	else if (self == 0 || (self == -1 && isPlutoPak())) OriginalBigFont->CopyFrom(*BigFont15);
+	else if (self == 1 || (self == -1 && !isPlutoPak())) OriginalBigFont->CopyFrom(*BigFont13);
 }
 
 #if 0

wadsrc/static/language.def

@@ -0,0 +1,10 @@
+[default]
+CNTRLMNU_TITLE = "$$OPTMNU_CONTROLS";
+MOUSEMNU_TITLE = "$$OPTMNU_MOUSE";
+MNU_PLAYERSETUP = "$$OPTMNU_PLAYER";
+DSPLYMNU_TITLE = "$$OPTMNU_DISPLAY";
+AUTOMAPMNU_TITLE = "$$OPTMNU_AUTOMAP";
+OPENALMNU_TITLE = "$$SNDMNU_OPENAL";
+SNDMNU_TITLE = "$$OPTMNU_SOUND";
+MODMNU_TITLE = "$$SNDMNU_MODREPLAYER";
+MISCMNU_TITLE = "$$OPTMNU_MISCELLANEOUS";