[Scummvm-git-logs] scummvm master -> 5ff423484332a6193afce187dbfb028df5017b18

[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:
0dd5962b70 AGS: Only apply upscale mode for game formats < 3.1.0
5ff4234843 AGS: Fix convert_gui_to_game_resolution() format comparison


Commit: 0dd5962b705c2f178884752cb721ed37684c8fd0
    https://github.com/scummvm/scummvm/commit/0dd5962b705c2f178884752cb721ed37684c8fd0
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-27T00:36:41Z

Commit Message:
AGS: Only apply upscale mode for game formats < 3.1.0

This is taken from upstream to fix starting Gemini Rue
Windows from GOG.

See https://github.com/adventuregamestudio/ags/issues/1246

Changed paths:
    engines/ags/engine/game/game_init.cpp


diff --git a/engines/ags/engine/game/game_init.cpp b/engines/ags/engine/game/game_init.cpp
index 2b75806d42..033a2cbbc4 100644
--- a/engines/ags/engine/game/game_init.cpp
+++ b/engines/ags/engine/game/game_init.cpp
@@ -311,7 +311,7 @@ HGameInitError InitGameState(const LoadedGameEntities &ents, GameDataVersion dat
 	// itself still supports it, technically.
 	// This overriding option re-enables "upscaling". It works ONLY for low-res
 	// resolutions, such as 320x200 and 320x240.
-	if (_GP(usetup).override_upscale) {
+	if (_G(loaded_game_file_version) < kGameVersion_310 && _GP(usetup).override_upscale) {
 		if (_GP(game).GetResolutionType() == kGameResolution_320x200)
 			_GP(game).SetGameResolution(kGameResolution_640x400);
 		else if (_GP(game).GetResolutionType() == kGameResolution_320x240)


Commit: 5ff423484332a6193afce187dbfb028df5017b18
    https://github.com/scummvm/scummvm/commit/5ff423484332a6193afce187dbfb028df5017b18
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-27T00:39:54Z

Commit Message:
AGS: Fix convert_gui_to_game_resolution() format comparison

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


diff --git a/engines/ags/engine/main/engine_setup.cpp b/engines/ags/engine/main/engine_setup.cpp
index d0ee5c3966..c754755fcf 100644
--- a/engines/ags/engine/main/engine_setup.cpp
+++ b/engines/ags/engine/main/engine_setup.cpp
@@ -53,7 +53,7 @@ using namespace AGS::Engine;
 // Convert guis position and size to proper game resolution.
 // Necessary for pre 3.1.0 games only to sync with modern engine.
 void convert_gui_to_game_resolution(GameDataVersion filever) {
-	if (filever > kGameVersion_310)
+	if (filever >= kGameVersion_310)
 		return;
 
 	const int mul = _GP(game).GetDataUpscaleMult();