[Scummvm-git-logs] scummvm master -> eb851041edcef20d85f74c95d53e8c280fe8a0ef

[bluegr]

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:
eb851041ed AGOS: SIMON2: Fix pirate dialogue freeze


Commit: eb851041edcef20d85f74c95d53e8c280fe8a0ef
    https://github.com/scummvm/scummvm/commit/eb851041edcef20d85f74c95d53e8c280fe8a0ef
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2022-10-01T11:28:11+03:00

Commit Message:
AGOS: SIMON2: Fix pirate dialogue freeze

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


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