[Scummvm-git-logs] scummvm master -> 30fad183a7fef26d68bf28e32a2a0bb40ea70711

[dreammaster]

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

Summary:
7acf944d05 AGS: Fixed GUI controls not detected under mouse after enabling iface
4cda750621 AGS: Add Emscripten as a core platform
30fad183a7 AGS: Update comment for upstream sync point


Commit: 7acf944d051a00532f57b88b586469524ed6fa91
    https://github.com/scummvm/scummvm/commit/7acf944d051a00532f57b88b586469524ed6fa91
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-27T09:39:51-07:00

Commit Message:
AGS: Fixed GUI controls not detected under mouse after enabling iface

>From upstream f310a087390b8845916222695618b561156b4c8a

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


diff --git a/engines/ags/engine/ac/gui.cpp b/engines/ags/engine/ac/gui.cpp
index c865aea02b..cc286a8de0 100644
--- a/engines/ags/engine/ac/gui.cpp
+++ b/engines/ags/engine/ac/gui.cpp
@@ -492,10 +492,13 @@ void update_gui_disabled_status() {
 	}
 
 	if (all_buttons_was != _G(all_buttons_disabled)) {
+		// As controls become enabled we must notify parent GUIs
+		// to let them reset control-under-mouse detection
+		for (int aa = 0; aa < _GP(game).numgui; aa++) {
+			_GP(guis)[aa].OnControlPositionChanged(); // this marks GUI as changed too
+		}
+
 		if (_G(gui_disabled_style) != GUIDIS_UNCHANGED) {
-			for (int aa = 0; aa < _GP(game).numgui; aa++) {
-				_GP(guis)[aa].OnControlPositionChanged(); // this marks GUI for update
-			}
 			invalidate_screen();
 		}
 	}


Commit: 4cda7506210840ce33cb49521e9460159552e813
    https://github.com/scummvm/scummvm/commit/4cda7506210840ce33cb49521e9460159552e813
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-27T09:39:52-07:00

Commit Message:
AGS: Add Emscripten as a core platform

>From upstream 269e72f3f3319efe1b87122ee2809936b5eafbc8

Changed paths:
    engines/ags/engine/platform/base/ags_platform_driver.h
    engines/ags/shared/core/platform.h


diff --git a/engines/ags/engine/platform/base/ags_platform_driver.h b/engines/ags/engine/platform/base/ags_platform_driver.h
index 3ab486a98e..6322fe2d8e 100644
--- a/engines/ags/engine/platform/base/ags_platform_driver.h
+++ b/engines/ags/engine/platform/base/ags_platform_driver.h
@@ -56,7 +56,8 @@ enum eScriptSystemOSID {
 	eOS_Mac,
 	eOS_Android,
 	eOS_iOS,
-	eOS_PSP
+	eOS_PSP,
+	eOS_Web
 };
 
 enum SetupReturnValue {
diff --git a/engines/ags/shared/core/platform.h b/engines/ags/shared/core/platform.h
index 386e84e571..4529ffc9aa 100644
--- a/engines/ags/shared/core/platform.h
+++ b/engines/ags/shared/core/platform.h
@@ -38,6 +38,7 @@ namespace AGS3 {
 #define AGS_PLATFORM_OS_ANDROID (0)
 #define AGS_PLATFORM_OS_IOS     (0)
 #define AGS_PLATFORM_OS_PSP     (0)
+#define AGS_PLATFORM_OS_EMSCRIPTEN (0)
 // check Android first because sometimes it can get confused with host OS
 #elif defined(__ANDROID__) || defined(ANDROID)
 #define AGS_PLATFORM_SCUMMVM    (0)


Commit: 30fad183a7fef26d68bf28e32a2a0bb40ea70711
    https://github.com/scummvm/scummvm/commit/30fad183a7fef26d68bf28e32a2a0bb40ea70711
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-27T09:39:52-07:00

Commit Message:
AGS: Update comment for upstream sync point

Changed paths:
    engines/ags/ags.h


diff --git a/engines/ags/ags.h b/engines/ags/ags.h
index a55b8047d6..3aba375f4c 100644
--- a/engines/ags/ags.h
+++ b/engines/ags/ags.h
@@ -49,9 +49,8 @@ namespace AGS {
  * @brief Engine to run Adventure Game Studio games.
  */
 
-/* Synced up to upstream:
- * "Common: removed unused function"
- * fc6006ca3375ed19f23c8ef1c0b060af7be273d9
+/* Synced up to upstream: AGS 3.5.1.8
+ * 811f6c126fcff1cc5a0db8b6e0a1b9fca2550235
  */
 #define SCREEN_WIDTH 320
 #define SCREEN_HEIGHT 200