[Scummvm-git-logs] scummvm master -> 500a54a5595a3ea7385f4aac173fadd637658dfb

[dwatteau]

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:
500a54a559 Revert "AGOS: SIMON2: Fix pirate dialogue freeze"


Commit: 500a54a5595a3ea7385f4aac173fadd637658dfb
    https://github.com/scummvm/scummvm/commit/500a54a5595a3ea7385f4aac173fadd637658dfb
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-08-08T12:30:17+02:00

Commit Message:
Revert "AGOS: SIMON2: Fix pirate dialogue freeze"

This change introduced several character animation regressions in the
game, which may seem as a worse experience than the original issue with
the pirate dialogue, for most end users (Trac#13997).

This reverts commit eb851041edcef20d85f74c95d53e8c280fe8a0ef.

Changed paths:
    engines/agos/script.cpp
    engines/agos/vga.cpp


diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 6425b4c1f86..c49ead73f99 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -1066,7 +1066,7 @@ void AGOSEngine::stopAnimate(uint16 a) {
 void AGOSEngine::waitForSync(uint a) {
 	const uint maxCount = (getGameType() == GType_SIMON1) ? 1000 : 2500;
 
-	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE)) {
+	if (getGameType() == GType_SIMON1 && (getFeatures() & GF_TALKIE)) {
 		if (a != 200) {
 			uint16 tmp = _lastVgaWaitFor;
 			_lastVgaWaitFor = 0;
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index 3c79f9d3b40..15eb01c4b91 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -801,8 +801,7 @@ void AGOSEngine::vc15_sync() {
 		}
 	}
 
-	if (id != 200)
-		_lastVgaWaitFor = id;
+	_lastVgaWaitFor = id;
 	/* clear a wait event */
 	if (id == _vgaWaitFor)
 		_vgaWaitFor = 0;