[Scummvm-git-logs] scummvm master -> 4f59b48bc6a5bd6057460521389ce37ea2831b93

[athrxx]

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:
4f59b48bc6 KYRA: (MR/Chinese) - fix scene change checks


Commit: 4f59b48bc6a5bd6057460521389ce37ea2831b93
    https://github.com/scummvm/scummvm/commit/4f59b48bc6a5bd6057460521389ce37ea2831b93
Author: athrxx (athrxx at scummvm.org)
Date: 2021-04-29T18:50:15+02:00

Commit Message:
KYRA: (MR/Chinese) - fix scene change checks

Two more hardcoded changes for the Chinese version (with its slightly larger interface).

Changed paths:
    engines/kyra/engine/scene_mr.cpp


diff --git a/engines/kyra/engine/scene_mr.cpp b/engines/kyra/engine/scene_mr.cpp
index 944ba984b7..237a50aae6 100644
--- a/engines/kyra/engine/scene_mr.cpp
+++ b/engines/kyra/engine/scene_mr.cpp
@@ -200,8 +200,8 @@ void KyraEngine_MR::enterNewSceneUnk1(int facing, int unk1, int unk2) {
 
 		if (x2 >= 316)
 			x2 = 312;
-		if (y2 >= 185)
-			y2 = 183;
+		if (y2 >= _interfaceCommandLineY1 - 3)
+			y2 = _interfaceCommandLineY1 - 5;
 		if (x2 <= 4)
 			x2 = 8;
 	}
@@ -667,7 +667,7 @@ int KyraEngine_MR::checkSceneChange() {
 	} else if (charX >= 316 && _savedMouseState == -6) {
 		facing = 2;
 		process = 1;
-	} else if (charY >= 186 && _savedMouseState == -5) {
+	} else if (charY >= (_interfaceCommandLineY1 - 2) && _savedMouseState == -5) {
 		facing = 4;
 		process = 1;
 	} else if (charX <= 4 && _savedMouseState == -4) {