Merge remote-tracking branch 'origin/master' into bbvs

1 files changed, 12 insertions, 12 deletions

diff --git a/engines/agi/opcodes.cpp b/engines/agi/opcodes.cpp
index 807ab2dc2c..d893e44c12 100644
--- a/engines/agi/opcodes.cpp
+++ b/engines/agi/opcodes.cpp
@@ -367,6 +367,18 @@ void AgiEngine::setupOpcodes() {
 
 		logicNamesTest = insV2Test;
 		logicNamesCmd = insV2;
+
+		// Alter opcode parameters for specific games
+		// TODO: This could be either turned into a game feature, or a version
+		// specific check, instead of a game version check
+
+		// The Apple IIGS versions of MH1 and Goldrush both have a parameter for
+		// show.mouse and hide.mouse. Fixes bugs #3577754 and #3426946.
+		if ((getGameID() == GID_MH1 || getGameID() == GID_GOLDRUSH) &&
+			getPlatform() == Common::kPlatformApple2GS) {
+			logicNamesCmd[176].args = "n";	// hide.mouse
+			logicNamesCmd[178].args = "n";	// show.mouse
+		}
 	} else {
 		for (int i = 0; i < ARRAYSIZE(insV1Test); ++i)
 			_agiCondCommands[i] = insV1Test[i].func;
@@ -376,18 +388,6 @@ void AgiEngine::setupOpcodes() {
 		logicNamesTest = insV1Test;
 		logicNamesCmd = insV1;
 	}
-
-	// Alter opcode parameters for specific games
-	// TODO: This could be either turned into a game feature, or a version
-	// specific check, instead of a game version check
-
-	// The Apple IIGS versions of MH1 and Goldrush both have a parameter for
-	// show.mouse and hide.mouse. Fixes bugs #3577754 and #3426946.
-	if ((getGameID() == GID_MH1 || getGameID() == GID_GOLDRUSH) &&
-		getPlatform() == Common::kPlatformApple2GS) {
-		logicNamesCmd[176].args = "n";	// hide.mouse
-		logicNamesCmd[178].args = "n";	// show.mouse
-	}
 }
 
 }