[Scummvm-git-logs] scummvm master -> 5a12df7b4b54b572860fce812bc516f6e2cd4d52

[sluicebox]

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:
16ba8872b6 FREESCAPE: Fix MSVC warning
5a12df7b4b SCI32: Fix LIGHTHOUSE uninit variable read on VMD playback


Commit: 16ba8872b67df20551dda502913e2751fe15be56
    https://github.com/scummvm/scummvm/commit/16ba8872b67df20551dda502913e2751fe15be56
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-02-05T22:33:26-08:00

Commit Message:
FREESCAPE: Fix MSVC warning

Hopefully fixes github builds

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 d74e037ff80..17d708b62a0 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -559,7 +559,7 @@ void DarkEngine::pressedKey(const int keycode) {
 			_flyMode = false;
 			insertTemporaryMessage(_messagesList[13], _countdown - 2);
 		} else if (_flyMode) {
-			float hzFreq = 1193180.0 / 0xd537;
+			float hzFreq = 1193180.0f / 0xd537;
 			_speaker->play(Audio::PCSpeaker::kWaveFormSquare, hzFreq, -1);
 			_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, _speaker, -1, Audio::Mixer::kMaxChannelVolume / 2, 0, DisposeAfterUse::NO);
 			insertTemporaryMessage(_messagesList[11], _countdown - 2);


Commit: 5a12df7b4b54b572860fce812bc516f6e2cd4d52
    https://github.com/scummvm/scummvm/commit/5a12df7b4b54b572860fce812bc516f6e2cd4d52
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-02-05T22:33:26-08:00

Commit Message:
SCI32: Fix LIGHTHOUSE uninit variable read on VMD playback

Fixes bug #14924

Changed paths:
    engines/sci/engine/workarounds.cpp


diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 2461b2a9566..f28b88e412e 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -423,6 +423,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_LAURABOW2,      -1,    90,  1,        "MuseumActor", "init",                         nullptr,     6,     6, { WORKAROUND_FAKE,   0 } }, // Random actors in museum - bug #5197
 	{ GID_LAURABOW2,     240,   240,  0,     "sSteveAnimates", "changeState",                  nullptr,     0,     0, { WORKAROUND_FAKE,   0 } }, // Steve Dorian's idle animation at the docks - bug #5028
 	{ GID_LAURABOW2,      -1,   928,  0,              nullptr, "startText",                    nullptr,     0,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
+	{ GID_LIGHTHOUSE,     -1,     0,  0,          "globalVMD", "play",                         nullptr,     0,     0, { WORKAROUND_FAKE,   0 } }, // when playing a VMD while inventory is disabled (opening a portal in room 360) - bug #14924
 	{ GID_LIGHTHOUSE,     -1,    17,  0,              nullptr, "handleEvent",                  nullptr,     0,     0, { WORKAROUND_FAKE,   0 } }, // when operating the joystick in the puzzle to lower the bridge at the entrance to the workshop, or the joystick that moves the robotic arm in the mini-sub
 	{ GID_LONGBOW,        -1,     0,  0,            "Longbow", "restart",                      nullptr,     0,     0, { WORKAROUND_FAKE,   0 } }, // When canceling a restart game - bug #5244
 	{ GID_LONGBOW,        -1,   213,  0,              "clear", "handleEvent",                  nullptr,     0,     0, { WORKAROUND_FAKE,   0 } }, // When giving an answer using the druid hand sign code in any room