[Scummvm-git-logs] scummvm master -> 47bdff63c83d7f84dfbf111c549a7729b723aa61

[dwatteau]

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

Summary:
00cafb0a59 JANITORIAL: GRAPHICS: MACGUI: Fix 404 HTTP resource
47bdff63c8 GLK: Use plain int instead of int16 in GlkOptionsWidget::defineLayout()


Commit: 00cafb0a59f34f029547bb56c9f3476d57a18135
    https://github.com/scummvm/scummvm/commit/00cafb0a59f34f029547bb56c9f3476d57a18135
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-04-07T20:09:45+02:00

Commit Message:
JANITORIAL: GRAPHICS: MACGUI: Fix 404 HTTP resource

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 531534f51b4..247cb3d2b54 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -34,7 +34,7 @@
 namespace Graphics {
 
 // Source: Apple IIGS Technical Note #41, "Font Family Numbers"
-// https://www.1000bit.it/support/manuali/apple/technotes/iigs/tn.iigs.041.html
+// https://web.archive.org/web/20221006211144/www.1000bit.it/support/manuali/apple/technotes/iigs/tn.iigs.041.html
 static const struct FontProto {
 	int id;
 	Common::Language lang;


Commit: 47bdff63c83d7f84dfbf111c549a7729b723aa61
    https://github.com/scummvm/scummvm/commit/47bdff63c83d7f84dfbf111c549a7729b723aa61
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-04-07T20:09:49+02:00

Commit Message:
GLK: Use plain int instead of int16 in GlkOptionsWidget::defineLayout()

Hopefully, this works around the internal compiler errors of GCC 4.7
in this function, when targeting arm-vfp-riscos.

Fix OK'd by lephilousophe.

Changed paths:
    engines/glk/dialogs.cpp


diff --git a/engines/glk/dialogs.cpp b/engines/glk/dialogs.cpp
index b964ef839cd..d4d61ef2440 100644
--- a/engines/glk/dialogs.cpp
+++ b/engines/glk/dialogs.cpp
@@ -646,11 +646,11 @@ void GlkOptionsWidget::load() {
 void GlkOptionsWidget::defineLayout(GUI::ThemeEval &layouts,
 									const Common::String &layoutName,
 									const Common::String &overlayedLayout) const {
-	int16 baseScale = g_gui.xmlEval()->getVar("Globals.Line.Height", 16);
-	int16 labelWidth = baseScale * 4;
-	int16 popUpWidth = baseScale * 4.5;
-	int16 prefixWidth = baseScale * 1.5;
-	int16 hexWidth = baseScale * 3.5;
+	int baseScale = g_gui.xmlEval()->getVar("Globals.Line.Height", 16);
+	int labelWidth = baseScale * 4;
+	int popUpWidth = baseScale * 4.5;
+	int prefixWidth = baseScale * 1.5;
+	int hexWidth = baseScale * 3.5;
 
 	layouts.addDialog(layoutName, overlayedLayout)
 			.addLayout(GUI::ThemeLayout::kLayoutHorizontal)