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

[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:
d47127aa90 SCUMM: Simplify bug #4556 workaround; comment fixes


Commit: d47127aa907742eff032bfdeded9fb9058f80ae6
    https://github.com/scummvm/scummvm/commit/d47127aa907742eff032bfdeded9fb9058f80ae6
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2022-08-17T21:47:29+02:00

Commit Message:
SCUMM: Simplify bug #4556 workaround; comment fixes

Changed paths:
    engines/scumm/script_v2.cpp
    engines/scumm/script_v5.cpp
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 2c55833cac7..5ccaea0801c 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1240,13 +1240,8 @@ void ScummEngine_v2::o2_startScript() {
 	// a permanent resident.
 	// Our fix is simply to prevent the Cutscene playing, if the lab has already been stormed
 	if (_game.id == GID_MANIAC) {
-		if (_game.version >= 1 && script == 155) {
-			if (VAR(120) == 1)
-				return;
-		}
-		// Script numbers are different in V0
-		if (_game.version == 0 && script == 150) {
-			if (VAR(104) == 1)
+		if (script == MM_SCRIPT(150)) {
+			if (VAR(MM_VALUE(104, 120)) == 1)
 				return;
 		}
 	}
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index a598706e3f0..5ac7d5026e0 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1864,9 +1864,8 @@ void ScummEngine_v5::o5_putActor() {
 	y = getVarOrDirectWord(PARAM_3);
 
 	// WORKAROUND: When enabling the cigar smoke in the captain Smirk
-	// close-up, it turns out that the coordinates were changed in the CD
-	// version's script for no apparent reason. (Were they taken from the
-	// EGA version?)
+	// close-up, it turns out that the coordinates in the CD
+	// version's script were taken from the EGA version.
 	//
 	// The coordinates below are taken from the VGA floppy version. The
 	// "Ultimate Talkie" version also corrects the positions, but uses
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 5359f83e70d..ad07a59c47e 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2903,12 +2903,12 @@ int ScummEngine::getKeyState(int key) {
 void ScummEngine_v6::o6_delayFrames() {
 	// WORKAROUND:  At startup, Moonbase Commander will pause for 20 frames before
 	// showing the Infogrames logo.  The purpose of this break is to give time for the
-	// GameSpy Arcade application to fill with the Online game infomation.
+	// GameSpy Arcade application to fill with the online game infomation.
 	//
 	// [0000] (84) localvar2 = max(readConfigFile.number(":var263:","user","wait-for-gamespy"),10)
 	// [0029] (08) delayFrames((localvar2 * 2))
 	//
-	// But since we don't support GameSpy and have our own Online support, this break
+	// But since we don't support GameSpy and have our own online support, this break
 	// has become redundant and only wastes time.
 	if (_game.id == GID_MOONBASE && vm.slot[_currentScript].number == 69) {
 		pop();