mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-14 00:21:30 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
ec7f5410ca
95 changed files with 13 additions and 10 deletions
|
@ -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
|
||||
|
|
BIN
wadsrc/static/filter/blood/fonts/bigfont/0130.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/0130.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/0139.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/0139.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/014A.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/014A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/014C.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/014C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/0166.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/0166.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/018F.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/018F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/01FC.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/01FC.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/01FE.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/01FE.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/bigfont/1E84.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/bigfont/1E84.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/0130.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/0130.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/0131.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/0131.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/0139.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/0139.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/013A.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/013A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/014A.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/014A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/014B.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/014B.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/014C.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/014C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/014D.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/014D.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/0166.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/0166.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/0167.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/0167.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/018F.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/018F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FC.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FC.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FD.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FD.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FE.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FE.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FF.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/01FF.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/0259.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/0259.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/1E84.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/1E84.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/blood/fonts/smallfont/1E85.lmp
Normal file
BIN
wadsrc/static/filter/blood/fonts/smallfont/1E85.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/0130.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/0130.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/0139.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/0139.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/014A.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/014A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/014C.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/014C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/0166.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/0166.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/018F.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/018F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/01FC.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/01FC.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/01FE.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/01FE.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont13/1E84.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont13/1E84.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0130.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0130.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0139.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0139.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/014A.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/014A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/014C.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/014C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0166.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0166.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/018F.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/018F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/01FE.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/01FE.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/01Fc.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/01Fc.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0394.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0394.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0398.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0398.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/039B.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/039B.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/039E.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/039E.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/03A3.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/03A3.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/03A8.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/03A8.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/03A9.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/03A9.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0402.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0402.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0403.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0403.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0404.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0404.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0409.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0409.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040A.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040B.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040B.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040C.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040D.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040D.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040E.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040E.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040F.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/040F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0411.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0411.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0413.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0413.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0414.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0414.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0416.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0416.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0417.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0417.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0418.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0418.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0419.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0419.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/041B.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/041B.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/041F.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/041F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0423.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0423.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0424.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0424.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0426.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0426.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0427.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0427.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0428.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0428.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0429.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0429.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042A.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042B.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042B.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042C.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042D.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042D.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042E.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042E.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042F.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/042F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0490.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/0490.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/bigfont15/1E84.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/bigfont15/1E84.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/0130.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/0130.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/0139.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/0139.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/014A.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/014A.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/014C.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/014C.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/0166.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/0166.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/018F.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/018F.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/01FC.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/01FC.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/01FE.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/01FE.lmp
Normal file
Binary file not shown.
BIN
wadsrc/static/filter/duke/fonts/smallfont/1E84.lmp
Normal file
BIN
wadsrc/static/filter/duke/fonts/smallfont/1E84.lmp
Normal file
Binary file not shown.
10
wadsrc/static/language.def
Normal file
10
wadsrc/static/language.def
Normal file
|
@ -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";
|
Loading…
Reference in a new issue