[Scummvm-git-logs] scummvm master -> e7de492be182a2370a7514aa17394daede7df268
neuromancer
noreply at scummvm.org
Wed Nov 4 07:21:08 UTC 2026
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
1cda516614 HOLLYWOOD: fixes for coverity 1690065 and 1690080
5ecc7d8a07 HOLLYWOOD: fixes for coverity 1690138 and 1690159
e76b6dcddf HOLLYWOOD: fixes for coverity 1690129 and 1690116
c468238485 HOLLYWOOD: fixes for coverity 1690063, 1690155, 1690125, 1690134
32b53699e7 HOLLYWOOD: fixes for coverity 1690158
ecb0864652 HOLLYWOOD: fixes for coverity 1690099
eb87770af7 HOLLYWOOD: fixes for coverity 1690087
e7de492be1 HOLLYWOOD: fixes for coverity 1690088 and 1690149
Commit: 1cda516614d13c0d26c5beb3fdf0181ec1112d89
https://github.com/scummvm/scummvm/commit/1cda516614d13c0d26c5beb3fdf0181ec1112d89
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:44+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690065 and 1690080
Changed paths:
engines/hollywood/monsters/scenes/playable/scene6070.cpp
engines/hollywood/monsters/scenes/playable/scene6090.cpp
diff --git a/engines/hollywood/monsters/scenes/playable/scene6070.cpp b/engines/hollywood/monsters/scenes/playable/scene6070.cpp
index d08ce23c4f0..29d97418e4a 100644
--- a/engines/hollywood/monsters/scenes/playable/scene6070.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene6070.cpp
@@ -581,14 +581,18 @@ void Scene6070::runArrivalCutscene() {
_viewportMaxXOffset = kScene6070ArrivalViewportMaxX;
_viewportXOffset = MIN<uint16>(_viewportXOffset, _viewportMaxXOffset);
- walkActiveActorTo(0x288, 0x19a, 5, 0);
- waitSceneMillis(2000, false);
+ if (!walkActiveActorTo(0x288, 0x19a, 5, 0) || waitSceneMillis(2000, false))
+ return;
_sceneLayers.setLayerVisible(kScene6070ArrivalLayer, true);
playAnimationFrames(kScene6070ArrivalLayer,
AnimationFrameRange(0, ARRAYSIZE(kScene6070ArrivalFrameMap) - 1,
kScene6070OverlayFrameMillis));
+ if (animationPlaybackShouldStop())
+ return;
runCurtainClearToBlack();
+ if (animationPlaybackShouldStop())
+ return;
_vm->gameState().scene6070SuePresent = true;
_vm->gameState().mainFlowStateId = kScene7100DialogueEntryState;
}
diff --git a/engines/hollywood/monsters/scenes/playable/scene6090.cpp b/engines/hollywood/monsters/scenes/playable/scene6090.cpp
index b06dea55ccd..f2ee757dd61 100644
--- a/engines/hollywood/monsters/scenes/playable/scene6090.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene6090.cpp
@@ -970,9 +970,11 @@ void Scene6090::runRopeRescueSequence() {
startRealtimePrimarySpeechLine(15, 30, 0x13e, 0x50,
0x20, 0x32, 0, kScene6090InvalidSpeechGroup, kScene6090PrimarySpeechId);
- waitForRealtimeSpeech(false);
+ if (waitForRealtimeSpeech(false))
+ return;
beginSecondarySpeechLine(15, 31);
- walkActiveActorTo(0xaa, 0x118, 5, 0);
+ if (animationPlaybackShouldStop() || !walkActiveActorTo(0xaa, 0x118, 5, 0))
+ return;
_compositeMode = kSpecialComposite;
for (uint frame = 0; frame + 1 < ARRAYSIZE(kScene6090SpecialEffectFrameMap) &&
@@ -1000,7 +1002,8 @@ void Scene6090::runRopeRescueSequence() {
_escapeChannel.reset(0, kScene6090FrameMillis);
_muffledSpeechStarted = false;
beginSecondarySpeechLine(15, 34);
- walkActiveActorTo(0xf0, 0x115, 4, 0);
+ if (animationPlaybackShouldStop() || !walkActiveActorTo(0xf0, 0x115, 4, 0))
+ return;
_escapePaletteSource = _paletteCurrent;
_paletteFadeThreshold = 1;
@@ -1017,22 +1020,39 @@ void Scene6090::runRopeRescueSequence() {
beginPrimarySpeechLineWithAnimationGroup(15, 35, 0xe4, 0x78,
0x3f, 0x28, 0x32, kScene6090SueSpeechGroup);
+ if (animationPlaybackShouldStop())
+ return;
if (restoreRescueLine) {
beginSecondarySpeechLine(15, 32);
+ if (animationPlaybackShouldStop())
+ return;
_paletteFadeChannel.reset(0, kScene6090FrameMillis);
_escapePaletteActive = true;
}
beginPrimarySpeechLineWithAnimationGroup(15, 36, 0xe4, 0x78,
0x3f, 0x28, 0x32, kScene6090SueSpeechGroup);
+ if (animationPlaybackShouldStop())
+ return;
beginSecondarySpeechLine(15, 37);
+ if (animationPlaybackShouldStop())
+ return;
beginPrimarySpeechLineWithAnimationGroup(15, 38, 0xe4, 0x78,
0x3f, 0x28, 0x32, kScene6090SueSpeechGroup);
+ if (animationPlaybackShouldStop())
+ return;
beginSecondarySpeechLine(15, 39);
+ if (animationPlaybackShouldStop())
+ return;
beginPrimarySpeechLineWithAnimationGroup(15, 40, 0xe4, 0x78,
0x3f, 0x28, 0x32, kScene6090SueSpeechGroup);
+ if (animationPlaybackShouldStop())
+ return;
_soundBank0.playSample(0x15, 100);
- waitSceneMillis(2000, false);
+ if (waitSceneMillis(2000, false))
+ return;
beginSecondarySpeechLine(15, 41);
+ if (animationPlaybackShouldStop())
+ return;
_vm->gameState().mainFlowStateId = kScene9150State;
}
Commit: 5ecc7d8a079c18bead42ce5cefd5c67508e4b958
https://github.com/scummvm/scummvm/commit/5ecc7d8a079c18bead42ce5cefd5c67508e4b958
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690138 and 1690159
Changed paths:
engines/hollywood/monsters/scenes/playable/scene4010.cpp
engines/hollywood/monsters/scenes/playable/scene4010.h
engines/hollywood/runaway/video.cpp
diff --git a/engines/hollywood/monsters/scenes/playable/scene4010.cpp b/engines/hollywood/monsters/scenes/playable/scene4010.cpp
index d70b5cb6c06..186d07631d4 100644
--- a/engines/hollywood/monsters/scenes/playable/scene4010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene4010.cpp
@@ -19,8 +19,6 @@
*
*/
-#include "graphics/pixelformat.h"
-
#include "hollywood/monsters/hollywood.h"
#include "hollywood/monsters/gameplay/game_state.h"
#include "hollywood/monsters/graphics.h"
@@ -153,8 +151,6 @@ Scene4010::Scene4010(HollywoodEngine *vm) :
_roomIdleChannel(),
_paletteCycleChannel(),
_secondaryAmbientChannel(),
- _normalBaseFramebuffer(),
- _normalBaseFramebufferInitialized(false),
_heckerAnimationState(0),
_heckerLoopCount(0),
_previousSecondaryAmbientCue(0),
@@ -163,12 +159,10 @@ Scene4010::Scene4010(HollywoodEngine *vm) :
_heckerPoseTransitionPending(false),
_roomAnimationPaused(false) {
_sceneLayers.configure(kScene4010LayerSpecs);
- _normalBaseFramebuffer.create(HollywoodEngine::kSceneBufferWidth, HollywoodEngine::kSceneBufferHeight,
- Graphics::PixelFormat::createFormatCLUT8());
}
uint Scene4010::framebufferResourceChunkIndex() const {
- return _releaseProfile.framebufferChunkIndex;
+ return alternateBackgroundActive() ? 5 : _releaseProfile.framebufferChunkIndex;
}
void Scene4010::initializeCustomPreviewState() {
@@ -331,8 +325,7 @@ bool Scene4010::applyCustomSceneStateToHotspotsAndPatches(byte selector) {
return true;
if (selector == 0xff) {
- ensureNormalBaseFramebuffer();
- applyD01BackgroundForCurrentState();
+ restoreBaseFramebufferFromOriginal();
memcpy(_paletteMask.data(), _paletteMaskOriginal.data(), _paletteMask.size());
memcpy(_fullPaletteRegionMask.data(), _paletteMaskOriginal.data(), _fullPaletteRegionMask.size());
if (_releaseProfile.usesDemoThrownItemLayout)
@@ -1052,25 +1045,6 @@ void Scene4010::applyBaseFramebufferPatch(uint chunkIndex) {
drawResourceBlockList(_resourceArena, _resourceChunkOffsets[chunkIndex], _baseFramebuffer);
}
-void Scene4010::ensureNormalBaseFramebuffer() {
- if (_normalBaseFramebufferInitialized)
- return;
-
- _normalBaseFramebuffer.copyFrom(_baseFramebufferOriginal);
- _normalBaseFramebufferInitialized = true;
-}
-
-void Scene4010::applyD01BackgroundForCurrentState() {
- if (alternateBackgroundActive()) {
- loadFixedChunk(5, _baseFramebuffer, kSceneBufferByteCount);
- _baseFramebufferOriginal.copyFrom(_baseFramebuffer);
- return;
- }
-
- _baseFramebuffer.copyFrom(_normalBaseFramebuffer);
- _baseFramebufferOriginal.copyFrom(_normalBaseFramebuffer);
-}
-
void Scene4010::copySmallRow(uint sourceOffset, uint destinationOffset) {
if (_stage003SmallRows.size() < sourceOffset + kStage003SmallRowSize ||
_stage003SmallRows.size() < destinationOffset + kStage003SmallRowSize)
diff --git a/engines/hollywood/monsters/scenes/playable/scene4010.h b/engines/hollywood/monsters/scenes/playable/scene4010.h
index ed750703f40..5b61105acd5 100644
--- a/engines/hollywood/monsters/scenes/playable/scene4010.h
+++ b/engines/hollywood/monsters/scenes/playable/scene4010.h
@@ -31,11 +31,6 @@ namespace Hollywood {
class HollywoodEngine;
struct Scene4010ReleaseProfile;
-/**
- * Switches between normal and alternate background modes at runtime. The
- * normal framebuffer is preserved before the alternate resource is loaded so
- * a later state refresh can restore the original background.
- */
class Scene4010 : public PlayableScene {
public:
Scene4010(HollywoodEngine *vm);
@@ -93,8 +88,6 @@ private:
void runDestinationUnlockAnimation();
void takeThrownItem();
void applyBaseFramebufferPatch(uint chunkIndex);
- void ensureNormalBaseFramebuffer();
- void applyD01BackgroundForCurrentState();
void copySmallRow(uint sourceOffset, uint destinationOffset);
void setScenePoint(uint baseOffset, byte itemId, uint16 x, uint16 y);
void clearVerbActionRecord(uint recordIndex);
@@ -106,8 +99,6 @@ private:
TimedAnimationChannel _roomIdleChannel;
TimedAnimationChannel _paletteCycleChannel;
TimedAnimationChannel _secondaryAmbientChannel;
- Graphics::ManagedSurface _normalBaseFramebuffer;
- bool _normalBaseFramebufferInitialized;
byte _heckerAnimationState;
byte _heckerLoopCount;
byte _previousSecondaryAmbientCue;
diff --git a/engines/hollywood/runaway/video.cpp b/engines/hollywood/runaway/video.cpp
index e13d2119d55..ec48ecbedc0 100644
--- a/engines/hollywood/runaway/video.cpp
+++ b/engines/hollywood/runaway/video.cpp
@@ -30,9 +30,12 @@ namespace Hollywood {
bool RunawayVideo::load(const char *name) {
close();
Common::File file;
- if (!file.open(Common::Path(name)) || file.size() < 1024 || file.size() > 256 * 1024 * 1024)
+ if (!file.open(Common::Path(name)))
return false;
- _data.resize(file.size());
+ const int64 fileSize = file.size();
+ if (fileSize < 1024 || fileSize > 256 * 1024 * 1024)
+ return false;
+ _data.resize((uint)fileSize);
if (file.read(_data.data(), _data.size()) != _data.size())
return false;
if (READ_BE_UINT32(_data.data()) != MKTAG('R', 'I', 'F', 'F')) {
Commit: e76b6dcddf3df72e9f0ae4d3a8fde32dd2ef911f
https://github.com/scummvm/scummvm/commit/e76b6dcddf3df72e9f0ae4d3a8fde32dd2ef911f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690129 and 1690116
Changed paths:
engines/hollywood/monsters/scenes/intro/scene9130.cpp
engines/hollywood/monsters/scenes/intro/scene9130.h
engines/hollywood/monsters/scenes/intro/scene9170.cpp
diff --git a/engines/hollywood/monsters/scenes/intro/scene9130.cpp b/engines/hollywood/monsters/scenes/intro/scene9130.cpp
index 6ff4ce20e4c..1e7c27fe086 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9130.cpp
+++ b/engines/hollywood/monsters/scenes/intro/scene9130.cpp
@@ -67,6 +67,7 @@ Scene9130::Scene9130(HollywoodEngine *vm) :
_activeContinuationIndex(0),
_activeSpeechStyleIndex(0),
_activeSpeechCue(false),
+ _speechFallbackMillis(0),
_nextSpeechFrameIndex(0),
_clipFrameIndex(0) {
_paletteResource.resize(kPaletteSize);
@@ -139,14 +140,17 @@ void Scene9130::runClipAndDialogue() {
range.noFinalFrameDelay();
_animationPlayer.playAndPresent(_clipFrameIndex, range);
- while (_speech.isPlaying() && !_skipRequested && !Engine::shouldQuit()) {
+ while ((_speech.isPlaying() || _speechFallbackMillis != 0) && !_skipRequested && !Engine::shouldQuit()) {
presentFrame();
if (delay(10)) {
if (_skipRequested || Engine::shouldQuit())
return;
_speech.stop();
+ _speechFallbackMillis = 0;
clearSubtitle();
maybeStartNextSpeechLine();
+ } else {
+ _speechFallbackMillis -= MIN<uint32>(_speechFallbackMillis, 10);
}
}
}
@@ -162,14 +166,16 @@ bool Scene9130::waitForAnimationFrame(uint32 millis, bool allowSkip) {
TimedPresentationLoop loop(*this, millis, 5, allowSkip);
while (loop.beginFrame()) {
maybeStartNextSpeechLine();
- loop.finishFrame();
+ const uint32 slice = loop.finishFrame();
+ _speechFallbackMillis -= MIN(_speechFallbackMillis, slice);
}
if (!consumeStepAdvanceRequest())
return animationPlaybackShouldStop();
- if (_speech.isPlaying() || _subtitle.visible) {
+ if (_speech.isPlaying() || _speechFallbackMillis != 0 || _subtitle.visible) {
_speech.stop();
+ _speechFallbackMillis = 0;
clearSubtitle();
return false;
}
@@ -183,7 +189,7 @@ void Scene9130::drawClipFrame(byte frameIndex) {
}
void Scene9130::maybeStartNextSpeechLine() {
- if (_speech.isPlaying())
+ if (_speech.isPlaying() || _speechFallbackMillis != 0)
return;
if (_activeSpeechCue) {
@@ -239,13 +245,14 @@ bool Scene9130::startCurrentSpeechSegment() {
const uint16 sampleId = _activeVoiceSampleId == 0 ? 0 : _activeVoiceSampleId + _activeContinuationIndex;
++_activeContinuationIndex;
_speech.stop();
- if (sampleId != 0)
- _speech.playSample(sampleId, 100);
+ const bool started = sampleId != 0 && _speech.playSample(sampleId, 100);
+ _speechFallbackMillis = started ? 0 : MAX<uint32>(1200, _subtitle.lines.size() * 1100);
return true;
}
void Scene9130::stopAudio() {
_speech.stop();
+ _speechFallbackMillis = 0;
_music->stop();
}
diff --git a/engines/hollywood/monsters/scenes/intro/scene9130.h b/engines/hollywood/monsters/scenes/intro/scene9130.h
index 8be05469314..f7218ecb6d7 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9130.h
+++ b/engines/hollywood/monsters/scenes/intro/scene9130.h
@@ -57,6 +57,7 @@ private:
byte _activeContinuationIndex;
byte _activeSpeechStyleIndex;
bool _activeSpeechCue;
+ uint32 _speechFallbackMillis;
byte _nextSpeechFrameIndex;
byte _clipFrameIndex;
};
diff --git a/engines/hollywood/monsters/scenes/intro/scene9170.cpp b/engines/hollywood/monsters/scenes/intro/scene9170.cpp
index 7ed0330972f..6c02c5e05d0 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9170.cpp
+++ b/engines/hollywood/monsters/scenes/intro/scene9170.cpp
@@ -481,8 +481,9 @@ void Scene9170::advanceLowerRoomAmbience() {
_effectFrame = (_effectFrame + 1) % ARRAYSIZE(kScene9170EffectFrameMap);
_effectDirty = true;
- if (_ambientSpeechSampleId != 0 && !_ambientSpeech.isPlaying())
- _ambientSpeech.playSample(_ambientSpeechSampleId, 50);
+ if (_ambientSpeechSampleId != 0 && !_ambientSpeech.isPlaying() &&
+ !_ambientSpeech.playSample(_ambientSpeechSampleId, 50))
+ _ambientSpeechSampleId = 0;
if (!_ambientSound.isPlaying())
_ambientSound.playSample(0x1b, 100);
}
Commit: c4682384853059f69ca8c0ac47a016dd44829858
https://github.com/scummvm/scummvm/commit/c4682384853059f69ca8c0ac47a016dd44829858
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690063, 1690155, 1690125, 1690134
Changed paths:
engines/hollywood/monsters/scenes/playable/playable_scene.cpp
engines/hollywood/monsters/scenes/playable/scene6090.cpp
engines/hollywood/monsters/scenes/playable/scene8010.cpp
diff --git a/engines/hollywood/monsters/scenes/playable/playable_scene.cpp b/engines/hollywood/monsters/scenes/playable/playable_scene.cpp
index bdcd7328b96..7ea1e3e4b98 100644
--- a/engines/hollywood/monsters/scenes/playable/playable_scene.cpp
+++ b/engines/hollywood/monsters/scenes/playable/playable_scene.cpp
@@ -1824,7 +1824,7 @@ bool PlayableScene::playFullscreenDeltaAnimation(const Common::Array<byte> &base
}
}
- _paletteCurrent = blackPalette;
+ _paletteCurrent = Common::move(blackPalette);
_displayPalette.markAllDirty();
presentFrame();
diff --git a/engines/hollywood/monsters/scenes/playable/scene6090.cpp b/engines/hollywood/monsters/scenes/playable/scene6090.cpp
index f2ee757dd61..6109e9eebbf 100644
--- a/engines/hollywood/monsters/scenes/playable/scene6090.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene6090.cpp
@@ -755,7 +755,7 @@ void Scene6090::runInterruptionClips() {
memset(_paletteCurrent.data(), 0, _paletteCurrent.size());
presentFrame();
- _paletteCurrent = firstPalette;
+ _paletteCurrent = Common::move(firstPalette);
_sceneFramebuffer.copyRectToSurface(firstBase.rawSurface(), 0, 0,
Common::Rect(0, 0, HollywoodEngine::kSceneBufferWidth, HollywoodEngine::kSceneBufferHeight));
for (uint frame = 0; frame < 0x2e && !Engine::shouldQuit() &&
@@ -792,7 +792,7 @@ void Scene6090::runInterruptionClips() {
memset(_paletteCurrent.data(), 0, _paletteCurrent.size());
presentFrame();
- _paletteCurrent = secondPalette;
+ _paletteCurrent = Common::move(secondPalette);
if (showRestoredSubtitle && _speechOverlay.visible)
setPaletteEntry6Bit(_speechOverlay.colorIndex, 0x3f, 0x3f, 0x3f);
_sceneFramebuffer.copyRectToSurface(secondBase.rawSurface(), 0, 0,
diff --git a/engines/hollywood/monsters/scenes/playable/scene8010.cpp b/engines/hollywood/monsters/scenes/playable/scene8010.cpp
index 9cdd5a5da04..eaf53c1a005 100644
--- a/engines/hollywood/monsters/scenes/playable/scene8010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene8010.cpp
@@ -841,7 +841,7 @@ bool Scene8010::runFishermanGeneratedPrimarySpeechLine(byte promptLineIndex) {
kScene8010FishermanSpeechBlue);
_primarySpeechOverlay.visible = true;
_primarySpeechOverlay.colorIndex = 0xfb;
- _primarySpeechOverlay.lines = lines;
+ _primarySpeechOverlay.lines = Common::move(lines);
calculateSpeechOverlayBounds(_primarySpeechOverlay, kScene8010FishermanSpeechCenterX,
kScene8010FishermanSpeechTopY, true, _activeActorWorldY);
Commit: 32b53699e7aaf15a98c617e63eb7f9cd3d43a54c
https://github.com/scummvm/scummvm/commit/32b53699e7aaf15a98c617e63eb7f9cd3d43a54c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690158
Changed paths:
engines/hollywood/runaway/graphics.cpp
diff --git a/engines/hollywood/runaway/graphics.cpp b/engines/hollywood/runaway/graphics.cpp
index 9ec98623efe..5b547dc0988 100644
--- a/engines/hollywood/runaway/graphics.cpp
+++ b/engines/hollywood/runaway/graphics.cpp
@@ -303,7 +303,8 @@ void RunawayActor::draw(Graphics::ManagedSurface &surface, Common::Point positio
{85,80,75}, {75,70,65}, {70,65,60} };
if (sunlit) {
const byte windowLight[2][3] = {{90, 85, 80}, {80, 75, 70}};
- memcpy(lights[1], windowLight, sizeof(windowLight));
+ memcpy(lights[1], windowLight[0], sizeof(windowLight[0]));
+ memcpy(lights[2], windowLight[1], sizeof(windowLight[1]));
}
uint16 palette[256];
for (uint i = 0; i < 256; ++i) {
Commit: ecb08646529ca8ecdbe9784a668bda88e8ce361c
https://github.com/scummvm/scummvm/commit/ecb08646529ca8ecdbe9784a668bda88e8ce361c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690099
Changed paths:
engines/hollywood/monsters/scenes/playable/scene1080.cpp
engines/hollywood/monsters/scenes/playable/scene1080.h
diff --git a/engines/hollywood/monsters/scenes/playable/scene1080.cpp b/engines/hollywood/monsters/scenes/playable/scene1080.cpp
index 97b6afee201..32108a0ea09 100644
--- a/engines/hollywood/monsters/scenes/playable/scene1080.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene1080.cpp
@@ -237,12 +237,6 @@ bool Scene1080::shouldAnimatePrimarySpeechLine() const {
return true;
}
-byte Scene1080::primarySpeechAnimationBaseFrame(byte animationGroup) const {
- if (animationGroup == kScene1080FrancoisSpeechGroup)
- return 0;
- return 0;
-}
-
void Scene1080::setPrimarySpeechAnimationFrame(byte animationGroup, byte frameIndex) {
if (animationGroup == kScene1080FrancoisSpeechGroup)
_sceneLayers.setLayerFrame(kScene1080FrancoisLayer, frameIndex);
diff --git a/engines/hollywood/monsters/scenes/playable/scene1080.h b/engines/hollywood/monsters/scenes/playable/scene1080.h
index f01357378d6..4dcf6ecfc3d 100644
--- a/engines/hollywood/monsters/scenes/playable/scene1080.h
+++ b/engines/hollywood/monsters/scenes/playable/scene1080.h
@@ -43,7 +43,6 @@ private:
bool dispatchCustomSceneAction(uint16 handlerId) override;
bool applyCustomSceneStateToHotspotsAndPatches(byte selector) override;
bool shouldAnimatePrimarySpeechLine() const override;
- byte primarySpeechAnimationBaseFrame(byte animationGroup) const override;
void setPrimarySpeechAnimationFrame(byte animationGroup, byte frameIndex) override;
AmbientAudioProfile ambientAudioProfile() const override;
Commit: eb87770af76a378db3496b569adf69900a35f5ec
https://github.com/scummvm/scummvm/commit/eb87770af76a378db3496b569adf69900a35f5ec
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690087
Changed paths:
engines/hollywood/monsters/scenes/playable/scene8010.cpp
diff --git a/engines/hollywood/monsters/scenes/playable/scene8010.cpp b/engines/hollywood/monsters/scenes/playable/scene8010.cpp
index eaf53c1a005..ea45146712e 100644
--- a/engines/hollywood/monsters/scenes/playable/scene8010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene8010.cpp
@@ -133,6 +133,8 @@ Scene8010::Scene8010(HollywoodEngine *vm) :
_fishermanChannel(),
_fishermanSpeechIdleChannel(),
_secondaryAmbientChannel(),
+ _fishermanQuizEntries(),
+ _fishermanQuizFinalEntry(),
_fishermanState(0),
_fishermanRepeatCount(0),
_previousSecondaryAmbientCue(0),
Commit: e7de492be182a2370a7514aa17394daede7df268
https://github.com/scummvm/scummvm/commit/e7de492be182a2370a7514aa17394daede7df268
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T08:20:45+01:00
Commit Message:
HOLLYWOOD: fixes for coverity 1690088 and 1690149
Changed paths:
engines/hollywood/monsters/gameplay/game_state.h
diff --git a/engines/hollywood/monsters/gameplay/game_state.h b/engines/hollywood/monsters/gameplay/game_state.h
index c17ca47b5d4..dce4e49f214 100644
--- a/engines/hollywood/monsters/gameplay/game_state.h
+++ b/engines/hollywood/monsters/gameplay/game_state.h
@@ -835,9 +835,6 @@ struct GameplayState {
return 0;
const uint index = (uint)itemId * kInventoryVerbCount + stripIndex;
- if (index >= kFixedInventoryActionTableEntryCount)
- return 0;
-
return fixedInventoryVerbHandlerIdsByItemAndStrip[index];
}
@@ -846,9 +843,6 @@ struct GameplayState {
return 0;
const uint index = (uint)primaryItemId * kInventoryOwnerSlotStride + secondaryItemId;
- if (index >= kInventoryItemRelationTableEntryCount)
- return 0;
-
if (relationMode == 1)
return dialogueRelationMode1HandlerIdsByItemPair[index];
if (relationMode == 2)
More information about the Scummvm-git-logs
mailing list