[Scummvm-git-logs] scummvm master -> b2948060cf3d3aeeb8a82f53b8b3d759af7dfd6a

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0ccbcddb57 GUI: Disable BDF font scaling until it is fixed
b2948060cf DISTS: Added classicmacfonts.dat


Commit: 0ccbcddb575030fe1c28108f0ab3c5fec3ba70b3
    https://github.com/scummvm/scummvm/commit/0ccbcddb575030fe1c28108f0ab3c5fec3ba70b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-07-05T14:00:49+02:00

Commit Message:
GUI: Disable BDF font scaling until it is fixed

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index c1db060b543..e81f9354e31 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1780,7 +1780,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, cons
 	if (!font && allowNonScalable) {
 		font = loadFont(filename, fontName);
 
-		font = Graphics::BdfFont::scaleFont((const Graphics::BdfFont *)font, pointsize);
+		//font = Graphics::BdfFont::scaleFont((const Graphics::BdfFont *)font, pointsize);
 	}
 
 	// If the font is successfully loaded store it in the font manager.


Commit: b2948060cf3d3aeeb8a82f53b8b3d759af7dfd6a
    https://github.com/scummvm/scummvm/commit/b2948060cf3d3aeeb8a82f53b8b3d759af7dfd6a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-07-05T14:00:49+02:00

Commit Message:
DISTS: Added classicmacfonts.dat

This file contains fonts used for recreation of Classic Mac OS GUI. To generate it,
use the following commnand:

  devtools/dumper-companion.py createmacfonts

Changed paths:
  A dists/engine-data/classicmacfonts.dat
    Makefile.common
    dists/engine-data/README
    dists/irix/scummvm.idb
    dists/scummvm.rc
    dists/win32/migration.txt


diff --git a/Makefile.common b/Makefile.common
index 62972946365..ec80865d1c9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -482,7 +482,6 @@ endif
 ifdef USE_FREETYPE2
 DIST_FILES_ENGINEDATA+=fonts.dat
 endif
-DIST_FILES_ENGINEDATA+=macgui.dat
 ifdef ENABLE_GRIM
 DIST_FILES_ENGINEDATA+=grim-patch.lab
 endif
@@ -493,7 +492,9 @@ ifdef ENABLE_MYST3
 DIST_FILES_ENGINEDATA+=myst3.dat
 endif
 DIST_FILES_ENGINEDATA+=achievements.dat
+DIST_FILES_ENGINEDATA+=classicmacfonts.dat
 DIST_FILES_ENGINEDATA+=encoding.dat
+DIST_FILES_ENGINEDATA+=macgui.dat
 DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))
 
 # pred.dic is currently only used for the AGI engine
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 83471e57ced..f1cda5aa572 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -7,6 +7,12 @@ This file contains game resource data used by the Access engine.
 achievements.dat:
 This file contains Achievements and Statistics IDs and localization from Steam and GOG.
 
+classicmacfonts.dat:
+This file contains fonts used for recreation of Classic Mac OS GUI. To generate it,
+use the following commnand:
+
+  devtools/dumper-companion.py createmacfonts
+
 cryo.dat:
 This file contains a lot of hardcoded tables used by the Cryo engine.
 
diff --git a/dists/engine-data/classicmacfonts.dat b/dists/engine-data/classicmacfonts.dat
new file mode 100644
index 00000000000..bf0c3e75fc0
Binary files /dev/null and b/dists/engine-data/classicmacfonts.dat differ
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 3eb860ca8aa..4b36e474426 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -17,6 +17,7 @@ f 0755 root sys usr/ScummVM/scummvm scummvm scummvm.sw.eoe tag('0x5260dbec')
 f 0644 root sys usr/ScummVM/share/pixmaps/scummvm.xpm scummvm.xpm scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/access.dat access.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/achievements.dat achievements.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/classicmacfonts.dat classicmacfonts.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/cryo.dat cryo.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/cryomni3d.dat cryomni3d.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/drascula.dat drascula.dat scummvm.sw.eoe
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 7983152a64a..11456bb1c1a 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -28,6 +28,8 @@ gui-icons.dat          FILE    "gui/themes/gui-icons.dat"
 shaders.dat            FILE    "gui/themes/shaders.dat"
 achievements.dat       FILE    "dists/engine-data/achievements.dat"
 encoding.dat           FILE    "dists/engine-data/encoding.dat"
+macgui.dat             FILE    "dists/engine-data/macgui.dat"
+classicmacfonts.dat    FILE    "dists/engine-data/classicmacfonts.dat"
 
 // Engine or feature specific resources
 #ifdef BUILTIN_RESOURCES
@@ -50,7 +52,6 @@ wwwroot.zip            FILE    "dists/networking/wwwroot.zip"
 #ifdef USE_FREETYPE2
 fonts.dat              FILE    "dists/engine-data/fonts.dat"
 #endif
-macgui.dat             FILE    "dists/engine-data/macgui.dat"
 
 #if PLUGIN_ENABLED_STATIC(ACCESS)
 access.dat             FILE    "dists/engine-data/access.dat"
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index e6e6134f496..6afece766d7 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -13,6 +13,7 @@ COPYING.txt
 COPYRIGHT.txt
 access.dat
 achievements.dat
+classicmacfonts.dat
 cryo.dat
 cryomni3d.dat
 drascula.dat