[Scummvm-git-logs] scummvm branch-2-6 -> 038453f0a24c9e74eb368636fad49088809d6a92

[dreammaster]

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:
038453f0a2 CHEWY: Fix cursor crash in room 4 console


Commit: 038453f0a24c9e74eb368636fad49088809d6a92
    https://github.com/scummvm/scummvm/commit/038453f0a24c9e74eb368636fad49088809d6a92
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-06-12T20:01:50-07:00

Commit Message:
CHEWY: Fix cursor crash in room 4 console

Changed paths:
    engines/chewy/rooms/room04.cpp


diff --git a/engines/chewy/rooms/room04.cpp b/engines/chewy/rooms/room04.cpp
index 93dc58c8678..c66a06cf0f1 100644
--- a/engines/chewy/rooms/room04.cpp
+++ b/engines/chewy/rooms/room04.cpp
@@ -63,7 +63,14 @@ int16 Room4::comp_probe() {
 
 	start_aad(46);
 	while (!endLoop) {
+		// WORKAROUND: The original constrained the mouse area.
+		// We don't do that in ScummVM so the below prevents
+		// potential crashes caused by the hand sprites being
+		// unloaded if the cursor is moved up too high
+		if (g_events->_mousePos.y < 135)
+			g_events->_mousePos.y = 135;
 		mouseAction();
+
 		if (_G(mouseLeftClick)) {
 			switch (_G(in)->findHotspot(CONSOLE_HOTSPOTS)) {
 			case 0: