Skip to content

Commit 18d85fd

Browse files
committed
Update icons font
1 parent 971f839 commit 18d85fd

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ set(EXPECTED_DATA
11381138
file_icons.png
11391139
fonts/DejaVuSans.ttf
11401140
fonts/GlowSansJCompressed-Book.otf
1141-
fonts/Icons.ttf
1141+
fonts/Icons.otf
11421142
fonts/SourceHanSansSC-Regular.otf
11431143
game.png
11441144
gui_buttons.png

data/fonts/Icons.otf

951 KB
Binary file not shown.

data/fonts/Icons.ttf

-125 KB
Binary file not shown.

license.txt

+8-11
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,17 @@ freely, subject to the following restrictions:
2323
All content under 'data' except the assets, font, language & skin files,
2424
(which have their own licenses) are released under
2525
CC-BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/).
26-
Apache 2.0 for the 'Icon.tff' file:
27-
Copyright Google
26+
SIL OFL 1.1 License for the 'Icon.otf' ('Font Awesome 6 Free-Solid-900.otf') file:
2827

29-
Licensed under the Apache License, Version 2.0 (the "License");
30-
you may not use this file except in compliance with the License.
31-
You may obtain a copy of the License at
28+
Copyright (c) 2022 Fonticons, Inc. (https://fontawesome.com)
29+
with Reserved Font Name: "Font Awesome".
3230

33-
http://www.apache.org/licenses/LICENSE-2.0
31+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
32+
This license is copied below, and is also available with a FAQ at:
33+
http://scripts.sil.org/OFL
3434

35-
Unless required by applicable law or agreed to in writing, software
36-
distributed under the License is distributed on an "AS IS" BASIS,
37-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
38-
See the License for the specific language governing permissions and
39-
limitations under the License.
35+
SIL OPEN FONT LICENSE
36+
Version 1.1 - 26 February 2007
4037

4138
The other fonts are released under CC-BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/).
4239

src/engine/client/text.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ class CTextRender : public IEngineTextRender
693693

694694
IStorage *pStorage = Kernel()->RequestInterface<IStorage>();
695695
char aFilename[IO_MAX_PATH_LENGTH];
696-
const char *pFontFile = "fonts/Icons.ttf";
696+
const char *pFontFile = "fonts/Icons.otf";
697697
IOHANDLE File = pStorage->OpenFile(pFontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename));
698698
if(File)
699699
{

0 commit comments

Comments
 (0)