[Scummvm-git-logs] scummvm master -> 50e6460fe26b113b1d99db589e9a5da5ba14bea3

[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:
8381367a54 KYRA: Added detection to an unsupported variant of LOL demo. Bugreport #6777
50e6460fe2 BACKENDS: OPENGL: Add workaround for macOS window size memorizing


Commit: 8381367a54af893782b09cf132b257de3da5c67a
    https://github.com/scummvm/scummvm/commit/8381367a54af893782b09cf132b257de3da5c67a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-19T13:10:25+02:00

Commit Message:
KYRA: Added detection to an unsupported variant of LOL demo. Bugreport #6777

Changed paths:
    engines/kyra/detection_tables.h


diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 8ae1639a69..83db12d69f 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -1627,6 +1627,20 @@ const KYRAGameDescription adGameDescs[] = {
 		LOL_DEMO_FLAGS
 	},
 
+	// Interactive CD demo, Bugreport #6777
+	{
+		{
+			"lol",
+			_s("Missing game code"), // Reason for being unsupported
+			AD_ENTRY1s("GENERAL.PAK", "17e442d3b6109d4ae8354fa55d6c8121", 710633),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_DEMO | ADGF_UNSUPPORTED,
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
+		},
+		LOL_DEMO_FLAGS
+	},
+
 	{
 		{
 			"eob",


Commit: 50e6460fe26b113b1d99db589e9a5da5ba14bea3
    https://github.com/scummvm/scummvm/commit/50e6460fe26b113b1d99db589e9a5da5ba14bea3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-19T13:10:25+02:00

Commit Message:
BACKENDS: OPENGL: Add workaround for macOS window size memorizing

Changed paths:
    backends/graphics/openglsdl/openglsdl-graphics.cpp


diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 33eb0b80fd..314011fa17 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -302,6 +302,12 @@ void OpenGLSdlGraphicsManager::notifyResize(const int width, const int height) {
 
 	// Remember window size in windowed mode
 	if (!_wantsFullScreen) {
+
+		// FIXME HACK. I don't like this at all, but macOS requires window size in LoDPI
+#ifdef __APPLE__
+		currentWidth /= scale;
+		currentHeight /= scale;
+#endif
 		ConfMan.setInt("last_window_width", currentWidth, Common::ConfigManager::kApplicationDomain);
 		ConfMan.setInt("last_window_height", currentHeight, Common::ConfigManager::kApplicationDomain);
 		ConfMan.flushToDisk();