[Scummvm-cvs-logs] scummvm master -> 6ee723c905979ad5a6c73bf86251391e8ffaecac

[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:
6ee723c905 HOPKINS: Bugfix for #3612410 - hotspots are off


Commit: 6ee723c905979ad5a6c73bf86251391e8ffaecac
    https://github.com/scummvm/scummvm/commit/6ee723c905979ad5a6c73bf86251391e8ffaecac
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-05-13T20:44:53-07:00

Commit Message:
HOPKINS: Bugfix for #3612410 - hotspots are off

Changed paths:
    engines/hopkins/lines.cpp



diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 8d15818..6ec48ce 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2596,6 +2596,11 @@ int LinesManager::getMouseZone() {
 							_zone[bobZoneId]._destY = _vm->_objectsMan->_bob[bobId]._oldHeight + _vm->_objectsMan->_bob[bobId]._oldY + 6;
 							_zone[bobZoneId]._spriteIndex = -1;
 						}
+
+						// WORKAROUND: Avoid allowing hotspots that should remain non-interactive
+						if (bobZoneId == 24 && _vm->_globals->_curRoomNum == 14)
+							continue;
+
 						return bobZoneId;
 					}
 			}
@@ -2891,6 +2896,10 @@ void LinesManager::checkZone() {
 		int zoneId;
 		if (_oldMouseX != mouseX || _oldMouseY != oldMouseY) {
 			zoneId = getMouseZone();
+
+			// WORKAROUND: Incorrect hotspot zones in the guard's control room
+			if (_vm->_globals->_curRoomNum == 71 && (zoneId == 14 || zoneId == 12 || zoneId == 17))
+				zoneId = _oldMouseZoneId;
 		} else {
 			zoneId = _oldMouseZoneId;
 		}