[Scummvm-git-logs] scummvm branch-2-6 -> 23ba7d9e000e7090a24113c737aa574809914323

[criezy]

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:
6976dd61da AGS: Fix regression with GUI translation option not working
23ba7d9e00 AGS: Fix regression with GUI Text Antialiasing option not working


Commit: 6976dd61dae4ee0de74c260fca17894c96f53e88
    https://github.com/scummvm/scummvm/commit/6976dd61dae4ee0de74c260fca17894c96f53e88
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-06T22:43:14+01:00

Commit Message:
AGS: Fix regression with GUI translation option not working

Changed paths:
    engines/ags/engine/main/config.cpp


diff --git a/engines/ags/engine/main/config.cpp b/engines/ags/engine/main/config.cpp
index c6f070aad00..709ff95c9cb 100644
--- a/engines/ags/engine/main/config.cpp
+++ b/engines/ags/engine/main/config.cpp
@@ -318,7 +318,11 @@ void apply_config(const ConfigTree &cfg) {
 		_GP(usetup).shared_data_dir = CfgReadString(cfg, "misc", "shared_data_dir");
 		_GP(usetup).show_fps = CfgReadBoolInt(cfg, "misc", "show_fps");
 
-		_GP(usetup).translation = CfgReadString(cfg, "language", "translation");
+		Common::String translation;
+		if (ConfMan.getActiveDomain()->tryGetVal("translation", translation) && !translation.empty())
+			_GP(usetup).translation = translation;
+		else
+			_GP(usetup).translation = CfgReadString(cfg, "language", "translation");
 
 		int cache_size_kb = CfgReadInt(cfg, "misc", "cachemax", DEFAULTCACHESIZE_KB);
 		if (cache_size_kb > 0)


Commit: 23ba7d9e000e7090a24113c737aa574809914323
    https://github.com/scummvm/scummvm/commit/23ba7d9e000e7090a24113c737aa574809914323
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-06T22:43:22+01:00

Commit Message:
AGS: Fix regression with GUI Text Antialiasing option not working

Changed paths:
    engines/ags/engine/ac/display.cpp


diff --git a/engines/ags/engine/ac/display.cpp b/engines/ags/engine/ac/display.cpp
index 85a2d5a6b6f..e7ccd9b10b8 100644
--- a/engines/ags/engine/ac/display.cpp
+++ b/engines/ags/engine/ac/display.cpp
@@ -445,7 +445,7 @@ int GetTextDisplayTime(const char *text, int canberel) {
 }
 
 bool ShouldAntiAliasText() {
-	return (_GP(game).GetColorDepth() >= 24) && (_GP(game).options[OPT_ANTIALIASFONTS] != 0);
+	return (_GP(game).GetColorDepth() >= 24) && (_GP(game).options[OPT_ANTIALIASFONTS] != 0 || ::AGS::g_vm->_forceTextAA);
 }
 
 void wouttextxy_AutoOutline(Bitmap *ds, size_t font, int32_t color, const char *texx, int &xxp, int &yyp) {