[Scummvm-git-logs] scummvm branch-2-6 -> 31c64c83cb6e35937d27e04d81462c7f6affb013

[dwatteau]

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

Summary:
125d28fdef AGOS: SIMON2: Fix pirate dialogue freeze
31c64c83cb NEWS: Mention pirate dialogue freeze fix in Simon2 for 2.6.1


Commit: 125d28fdef8e2ef1cf23b2a07127f2ca6a631881
    https://github.com/scummvm/scummvm/commit/125d28fdef8e2ef1cf23b2a07127f2ca6a631881
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2022-10-13T15:46:09+02:00

Commit Message:
AGOS: SIMON2: Fix pirate dialogue freeze

(cherry picked from 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 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;


Commit: 31c64c83cb6e35937d27e04d81462c7f6affb013
    https://github.com/scummvm/scummvm/commit/31c64c83cb6e35937d27e04d81462c7f6affb013
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-13T15:49:55+02:00

Commit Message:
NEWS: Mention pirate dialogue freeze fix in Simon2 for 2.6.1

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index eace78e3f5e..fd00fe6f50a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,6 +13,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  AGOS:
    - Fixed various bugs that lead to crashes in the demo versions of The Feeble Files
      and Personal Nightmare and in the full version of Waxworks.
+   - Fixed pirate dialogue freeze in Simon the Sorcerer 2.
 
  Asylum:
    - Fixed the Keyboard Config screen.