[Scummvm-git-logs] scummvm master -> 6bd4377dbe4d0bbff5c88f89313464a83615156c

[neuromancer]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6bd4377dbe FREESCAPE: refresh sensors when reloading


Commit: 6bd4377dbe4d0bbff5c88f89313464a83615156c
    https://github.com/scummvm/scummvm/commit/6bd4377dbe4d0bbff5c88f89313464a83615156c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-05-24T12:00:45+02:00

Commit Message:
FREESCAPE: refresh sensors when reloading

Changed paths:
    engines/freescape/freescape.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 43a3b06f69f..1e5a53ac115 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -1437,7 +1437,7 @@ Common::Error FreescapeEngine::loadGameStream(Common::SeekableReadStream *stream
 	// of the world before saving (or loading in-game right after a fall)
 	// persists and immediately ends the loaded game. Falling also tilts the
 	// camera (_roll) in some games and that value is not stored in the save,
-	// so reset it as well. Reported for Driller (Amiga), but applies to all games.
+	// so reset it as well.
 	_hasFallen = false;
 	_roll = 0;
 	_avoidRenderingFrames = 0;
@@ -1448,6 +1448,13 @@ Common::Error FreescapeEngine::loadGameStream(Common::SeekableReadStream *stream
 	if (!_currentArea || _currentArea->getAreaID() != areaID)
 		gotoArea(areaID, -1); // Do not change position nor rotation
 
+	// Refresh the engine-level sensor (turret) cache from the loaded area.
+	// gotoArea() is called here with entranceID -1, which does not run
+	// traverseEntrance() and therefore does not repopulate _sensors, so the
+	// previously visited area's sensors would otherwise leak into the loaded
+	// area at the same room coordinates.
+	_sensors = _currentArea->getSensors();
+
 	if (isDriller() && _playerHeightNumber == -1) {
 		_playerHeight = 2;
 	} else {