[Scummvm-git-logs] scummvm master -> 41984b71533a31336a2fedd782ea3ba613522702

[eriktorbjorn]

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:
41984b7153 SCUMM: Use new GF_ULTIMATE_TALKIE flag instead of strcmp()


Commit: 41984b71533a31336a2fedd782ea3ba613522702
    https://github.com/scummvm/scummvm/commit/41984b71533a31336a2fedd782ea3ba613522702
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-11-08T06:48:19+01:00

Commit Message:
SCUMM: Use new GF_ULTIMATE_TALKIE flag instead of strcmp()

This workaround was added after I submitted the recently merged pull
request, so it didn't get included in those changes.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 950dc77780b..e63a99e9483 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -3129,9 +3129,9 @@ void ScummEngine_v5::o5_walkActorTo() {
 	// strange, since he's then quite far away from the door. Force calling
 	// the script which closes the door *before* he starts walking away from
 	// it, as in the other releases. Another v5 bug fixed on SegaCD, though!
-	if (_game.id == GID_MONKEY && _game.platform != Common::kPlatformSegaCD && _currentRoom == 30 &&
-		vm.slot[_currentScript].number == 207 && a->_number == 11 && x == 232 && y == 141 &&
-		_enableEnhancements && strcmp(_game.variant, "SE Talkie") != 0) {
+	if (_game.id == GID_MONKEY && !(_game.features & GF_ULTIMATE_TALKIE) && _game.platform != Common::kPlatformSegaCD &&
+		_currentRoom == 30 && vm.slot[_currentScript].number == 207 && a->_number == 11 &&
+		x == 232 && y == 141 &&	_enableEnhancements) {
 		if (whereIsObject(387) == WIO_ROOM && getState(387) == 1 && getState(437) == 1) {
 			int args[NUM_SCRIPT_LOCAL];
 			memset(args, 0, sizeof(args));