Skip to content

Commit 50e3299

Browse files
committed
Revert "Update Unifont from 5.1 to 13.0.04 (#1980)"
This reverts commit 7528ff5.
1 parent 1c9ba3d commit 50e3299

File tree

10 files changed

+4
-54
lines changed

10 files changed

+4
-54
lines changed

Client/core/Graphics/CGraphics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ bool CGraphics::LoadStandardDXFonts()
13481348
m_FontResourceNames.push_back("sabankgothic.ttf");
13491349
m_FontResourceNames.push_back("saheader.ttf");
13501350
m_FontResourceNames.push_back("sagothic.ttf");
1351-
m_FontResourceNames.push_back("unifont-13.0.04.ttf");
1351+
m_FontResourceNames.push_back("unifont-5.1.20080907.ttf");
13521352
}
13531353

13541354
for (uint i = 0; i < m_FontResourceNames.size(); i++)

Client/gui/CGUI_Impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ using std::list;
2222
#define CGUI_MTA_DEFAULT_REG_BOLD "Tahoma Bold (TrueType)"
2323
#define CGUI_MTA_CLEAR_REG "Verdana (TrueType)"
2424

25-
#define CGUI_MTA_SUBSTITUTE_FONT "cgui/unifont-13.0.04.ttf" // GTA/MTA/<...>
25+
#define CGUI_MTA_SUBSTITUTE_FONT "cgui/unifont-5.1.20080907.ttf" // GTA/MTA/<...>
2626
#define CGUI_MTA_SANS_FONT "cgui/sans.ttf" // GTA/MTA/<...>
2727
#define CGUI_SA_HEADER_FONT "cgui/saheader.ttf" // GTA/MTA/<...>
2828
#define CGUI_SA_GOTHIC_FONT "cgui/sagothic.ttf" // GTA/MTA/<...>

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ ADD_ENUM(FONT_PRICEDOWN, "pricedown")
447447
ADD_ENUM(FONT_BANKGOTHIC, "bankgothic")
448448
ADD_ENUM(FONT_DIPLOMA, "diploma")
449449
ADD_ENUM(FONT_BECKETT, "beckett")
450-
ADD_ENUM(FONT_UNIFONT, "unifont")
451450
IMPLEMENT_ENUM_END_DEFAULTS("font-type", FONT_DEFAULT, "")
452451

453452
IMPLEMENT_ENUM_BEGIN(eFontQuality)

Shared/data/MTA San Andreas/MTA/cgui/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.
15.6 MB
Binary file not shown.

Shared/data/data files installer.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Section "Data files" SEC01
178178
File "${FILES_ROOT}\MTA San Andreas\mta\cgui\sagothic.ttf"
179179
File "${FILES_ROOT}\MTA San Andreas\mta\cgui\saheader.ttf"
180180
File "${FILES_ROOT}\MTA San Andreas\mta\cgui\sans.ttf"
181-
File "${FILES_ROOT}\MTA San Andreas\mta\cgui\unifont-13.0.04.ttf"
181+
File "${FILES_ROOT}\MTA San Andreas\mta\cgui\unifont-5.1.20080907.ttf"
182182

183183
SetOutPath "$INSTDIR\MTA\cgui\images"
184184
File "${FILES_ROOT}\MTA San Andreas\mta\cgui\images\*.png"

Shared/installer/nightly.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ SectionGroup /e "$(INST_SEC_CLIENT)" SECGCLIENT
739739
File "${FILES_ROOT}\mta\cgui\sagothic.ttf"
740740
File "${FILES_ROOT}\mta\cgui\saheader.ttf"
741741
File "${FILES_ROOT}\mta\cgui\sans.ttf"
742-
File "${FILES_ROOT}\mta\cgui\unifont-13.0.04.ttf"
742+
File "${FILES_ROOT}\mta\cgui\unifont-5.1.20080907.ttf"
743743

744744
SetOutPath "$INSTDIR\MTA\cgui\images"
745745
File "${FILES_ROOT}\mta\cgui\images\*.png"

premake5.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ require "install_data"
55
require "install_resources"
66
require "install_cef"
77
require "install_discord"
8-
require "install_unifont"
98

109
-- Set CI Build global
1110
local ci = os.getenv("CI")

utils/buildactions/install_unifont.lua

Lines changed: 0 additions & 44 deletions
This file was deleted.

win-create-projects.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
rem Update CEF eventually
44
utils\premake5.exe install_cef
55

6-
rem Update Unifont
7-
utils\premake5.exe install_unifont
8-
96
rem Generate solutions
107
utils\premake5.exe vs2019
118

0 commit comments

Comments
 (0)