thirdparty/amiberry
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged imagefont changes from "dev"

Browse source
This commit is contained in:
Dimitris Panokostas 2023-02-19 16:24:11 +01:00
parent 33960a599d
commit 71ecc3699b
5 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
data/fixedfont.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
data/fixedfont.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 568 B

BIN
data/rpgfont.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
src/osdep/gui/ShowMessage.cpp
View file

@ -175,7 +175,7 @@ static void InitShowMessage(const std::string& message)
{
TTF_Init();
#ifdef USE_OPENGL
gui_font = new gcn::ImageFont(prefix_with_data_path("fixedfont.bmp"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
gui_font = new gcn::ImageFont(prefix_with_data_path("rpgfont.png"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\"");
#else
gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path("AmigaTopaz.ttf"), 15);

2
src/osdep/gui/main_window.cpp
View file

@ -1224,7 +1224,7 @@ void gui_widgets_init()
try
{
#ifdef USE_OPENGL
gui_font = new gcn::ImageFont(prefix_with_data_path("fixedfont.bmp"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
gui_font = new gcn::ImageFont(prefix_with_data_path("rpgfont.png"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\"");
#else
gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path("AmigaTopaz.ttf"), 15);
#endif