HOPKINS: Bugfix for #3612410 - hotspots are off

scummvm · May 14, 2013 · b460b99 · b460b99
1 parent a360e4d
commit b460b99
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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;
 		}