[Scummvm-git-logs] scummvm branch-2-3 -> 3da05fa6b74ff96731ecd276a4db6430c12d4ec2

[dreammaster]

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

Summary:
3da05fa6b7 AGS: AGSParallax plugin fix, workaround for Stargate Adventures


Commit: 3da05fa6b74ff96731ecd276a4db6430c12d4ec2
    https://github.com/scummvm/scummvm/commit/3da05fa6b74ff96731ecd276a4db6430c12d4ec2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-21T21:09:21-07:00

Commit Message:
AGS: AGSParallax plugin fix, workaround for Stargate Adventures

Changed paths:
    engines/ags/engine/ac/global_video.cpp
    engines/ags/plugins/plugin_base.cpp


diff --git a/engines/ags/engine/ac/global_video.cpp b/engines/ags/engine/ac/global_video.cpp
index 759dc584d6..63907a6421 100644
--- a/engines/ags/engine/ac/global_video.cpp
+++ b/engines/ags/engine/ac/global_video.cpp
@@ -34,6 +34,7 @@
 #include "ags/engine/media/audio/audio_system.h"
 #include "ags/engine/platform/base/ags_platform_driver.h"
 #include "ags/shared/util/string_compat.h"
+#include "ags/ags.h"
 #include "ags/globals.h"
 
 namespace AGS3 {
@@ -47,6 +48,9 @@ void scrPlayVideo(const char *name, int skip, int flags) {
 		return;
 	if (_G(debug_flags) & DBG_NOVIDEO)
 		return;
+	// FIXME: Stargate Adventure videos used unsupported ix00 & ix01 audio tracks
+	if (::AGS::g_vm->getGameId() == "stargateadv")
+		return;
 
 	if ((flags < 10) && (_GP(usetup).audio_backend == 0)) {
 		// if game audio is disabled in Setup, then don't
diff --git a/engines/ags/plugins/plugin_base.cpp b/engines/ags/plugins/plugin_base.cpp
index c5f426201e..71e9d3c569 100644
--- a/engines/ags/plugins/plugin_base.cpp
+++ b/engines/ags/plugins/plugin_base.cpp
@@ -35,6 +35,7 @@
 #include "ags/plugins/ags_joy/ags_joy.h"
 #include "ags/plugins/ags_nickenstien_gfx/ags_nickenstien_gfx.h"
 #include "ags/plugins/ags_pal_render/ags_pal_render.h"
+#include "ags/plugins/ags_parallax/ags_parallax.h"
 #include "ags/plugins/ags_shell/ags_shell.h"
 #include "ags/plugins/ags_snow_rain/ags_snow_rain.h"
 #include "ags/plugins/ags_sock/ags_sock.h"
@@ -97,6 +98,10 @@ Plugins::PluginBase *pluginOpen(const char *filename) {
 	if (fname.equalsIgnoreCase("AGSPalRender"))
 		return new AGSPalRender::AGSPalRender();
 
+	if (fname.equalsIgnoreCase("ags_parallax") ||
+			fname.equalsIgnoreCase("AGSParallax"))
+		return new AGSParallax::AGSParallax();
+
 	if (fname.equalsIgnoreCase("ags_shell") || fname.equalsIgnoreCase("agsshell"))
 		return new AGSShell::AGSShell();