[Scummvm-git-logs] scummvm master -> 0209d796521c142ec207c7b8d40f5e2ae1dfc18e

[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:
0209d79652 SCUMM: Simplify Indy 3 Mac workarounds


Commit: 0209d796521c142ec207c7b8d40f5e2ae1dfc18e
    https://github.com/scummvm/scummvm/commit/0209d796521c142ec207c7b8d40f5e2ae1dfc18e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-08-09T10:06:26+02:00

Commit Message:
SCUMM: Simplify Indy 3 Mac workarounds

I was confused when writing them. There shouldn't be any need to check
if the script is global when that's already implied by the script
number.

Changed paths:
    engines/scumm/script.cpp
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 0fad1f5e0d..89d9610914 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1441,7 +1441,7 @@ void ScummEngine::decreaseScriptDelay(int amount) {
 		if (ss->status == ssPaused) {
 			ss->delay -= amount;
 			if (ss->delay < 0) {
-				if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && ss->number == 134 && ss->where == WIO_GLOBAL) {
+				if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && ss->number == 134) {
 					// Unlike the DOS version, there doesn't
 					// appear to be anything in the credits
 					// script to clear the credits between
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index b12cf6a24d..4a5aa9f67e 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2440,7 +2440,7 @@ void ScummEngine_v5::o5_verbOps() {
 			//
 			// I don't know if it has to be limited to this
 			// particular script, but that's what I'll do for now.
-			if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && verb == 101 && vm.slot[_currentScript].number == 12 && vm.slot[_currentScript].where == WIO_GLOBAL) {
+			if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && verb == 101 && vm.slot[_currentScript].number == 12) {
 				inventoryScriptIndy3Mac();
 			} else
 				vs->curmode = 1;