[Scummvm-git-logs] scummvm master -> 6907a85fe4fd1ad0e32b816de926a7acd816c608

[tag2015]

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:
6907a85fe4 AGS: Use guid instead of gameid for Donna AoB workaround


Commit: 6907a85fe4fd1ad0e32b816de926a7acd816c608
    https://github.com/scummvm/scummvm/commit/6907a85fe4fd1ad0e32b816de926a7acd816c608
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2024-04-25T18:58:30+02:00

Commit Message:
AGS: Use guid instead of gameid for Donna AoB workaround

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


diff --git a/engines/ags/engine/ac/global_video.cpp b/engines/ags/engine/ac/global_video.cpp
index 89be63820ab..cac187f02f5 100644
--- a/engines/ags/engine/ac/global_video.cpp
+++ b/engines/ags/engine/ac/global_video.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/config-manager.h"
 #include "ags/engine/ac/game_setup.h"
 #include "ags/engine/ac/game_state.h"
 #include "ags/engine/ac/global_audio.h"
@@ -95,10 +94,11 @@ void PlayVideo(const char *name, int skip, int scr_flags) {
 	if (_G(debug_flags) & DBG_NOVIDEO)
 		return;
 
-	// WORKAROUND: This video uses an unsupported codec and
+	// WORKAROUND: for Donna Avenger of Blood
+	// This video uses an unsupported codec and
 	// the decoder current implementation doesn't allow to
 	// continue gracefully
-	if (ConfMan.get("gameid") == "donnaavengerofblood" &&
+	if (!strcmp(_GP(game).guid, "{8e357476-2d9a-4233-b7cf-431ca727035a}") &&
 		!strcmp(name, "terminus")) {
 		warning("Skipped unsupported \'terminus\' video");
 		return;