[Scummvm-git-logs] scummvm master -> 3e590c70bc7eaaca49f721bceae4202358521338

[neuromancer]

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

Summary:
69a96d9ab2 FREESCAPE: correct firing range in dark
3e590c70bc FREESCAPE: always initialize variables in drawFullscreenMessage


Commit: 69a96d9ab2bc05b327f76e05a4ec0dad50f62a2d
    https://github.com/scummvm/scummvm/commit/69a96d9ab2bc05b327f76e05a4ec0dad50f62a2d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-07-26T22:56:08+02:00

Commit Message:
FREESCAPE: correct firing range in dark

Changed paths:
    engines/freescape/loaders/8bitBinaryLoader.cpp


diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index b3b368b18f0..55f85977f22 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -261,9 +261,12 @@ Object *FreescapeEngine::load8bitObject(Common::SeekableReadStream *file) {
 		byte color = readField(file, 8) & 0xf;
 		assert(color > 0);
 		byte firingInterval = readField(file, 8);
-		uint16 firingRange = readField(file, 16);
+		uint16 firingRange = readField(file, 16) / 2;
+		if (isDark())
+			firingRange = firingRange / 2;
 		byte sensorAxis = readField(file, 8);
 		byteSizeOfObject = byteSizeOfObject - 5;
+		debugC(1, kFreescapeDebugParser, "Sensor detected with firing interval %d, firing range %d and axis %d", firingInterval, firingRange, sensorAxis);
 		// grab the object condition, if there is one
 		if (byteSizeOfObject) {
 			Common::Array<uint16> conditionArray = readArray(file, byteSizeOfObject);


Commit: 3e590c70bc7eaaca49f721bceae4202358521338
    https://github.com/scummvm/scummvm/commit/3e590c70bc7eaaca49f721bceae4202358521338
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-07-26T22:58:26+02:00

Commit Message:
FREESCAPE: always initialize variables in drawFullscreenMessage

Changed paths:
    engines/freescape/games/dark/dark.cpp


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 7a669a393e0..7873b2c1553 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -316,7 +316,11 @@ void DarkEngine::drawFullscreenMessage(Common::String message, uint32 front, Gra
 
 	surface->fillRect(_fullscreenViewArea, color);
 	surface->fillRect(_viewArea, black);
-	int x, y, letterPerLine, numberOfLines;
+	int x = 0;
+	int y = 0;
+	int letterPerLine = 0;
+	int numberOfLines = 0;
+
 	if (isDOS()) {
 		x = 50;
 		y = 32;