[Scummvm-git-logs] scummvm master -> f305568a1bfec149a5ec899f61cdaf089d437d00
neuromancer
noreply at scummvm.org
Sat Oct 31 08:26:07 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
82180b82be HOLLYWOOD: correct skipping of animations in scene 9000
f305568a1b HOLLYWOOD: fix object labels when switching languages
Commit: 82180b82bea6751a764aa2e137ddf88b19c5f82e
https://github.com/scummvm/scummvm/commit/82180b82bea6751a764aa2e137ddf88b19c5f82e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-31T09:25:47+01:00
Commit Message:
HOLLYWOOD: correct skipping of animations in scene 9000
Changed paths:
engines/hollywood/monsters/scenes/intro/scene9000.cpp
engines/hollywood/monsters/scenes/intro/scene9000.h
diff --git a/engines/hollywood/monsters/scenes/intro/scene9000.cpp b/engines/hollywood/monsters/scenes/intro/scene9000.cpp
index 257359564fe..4527f6f4065 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9000.cpp
+++ b/engines/hollywood/monsters/scenes/intro/scene9000.cpp
@@ -39,18 +39,18 @@ bool Scene9000::play() {
_music.playIntroMusic();
+ bool skippedChunk = false;
for (uint chunkIndex = 0; chunkIndex < kIntroChunkCount && !_skipRequested && !Engine::shouldQuit(); ++chunkIndex) {
if (!loadChunk(chunkIndex)) {
_music.stop();
return false;
}
- if (!runChunk()) {
- _music.stop();
- return false;
- }
+ if (!runChunk())
+ skippedChunk = true;
}
- while (_music.isPlaying() && !_skipRequested && !Engine::shouldQuit()) {
+ // Skipped logos shorten the sequence, so don't wait for the remaining music.
+ while (!skippedChunk && _music.isPlaying() && !_skipRequested && !Engine::shouldQuit()) {
if (delay(10))
break;
}
@@ -89,7 +89,7 @@ bool Scene9000::runChunk() {
while ((frameIndex < kIntroFrameDescriptorCount || !fadeInComplete) && !_skipRequested && !Engine::shouldQuit()) {
if (pollEvents())
- return true;
+ return false;
if (frameIndex < kIntroFrameDescriptorCount) {
frameIndex++;
@@ -110,18 +110,18 @@ bool Scene9000::runChunk() {
presentFrame();
if (delay(kFrameStepMillis))
- return true;
+ return false;
}
for (uint holdStep = 0; holdStep < kHoldStepCount && !_skipRequested && !Engine::shouldQuit(); ++holdStep) {
if (delay(kHoldStepMillis))
- return true;
+ return false;
}
fadeThreshold = 0;
while ((frameIndex > 1 || !fadeOutComplete) && !_skipRequested && !Engine::shouldQuit()) {
if (pollEvents())
- return true;
+ return false;
if (frameIndex > 1) {
frameIndex--;
@@ -142,7 +142,7 @@ bool Scene9000::runChunk() {
presentFrame();
if (delay(kPaletteStepMillis))
- return true;
+ return false;
}
return true;
diff --git a/engines/hollywood/monsters/scenes/intro/scene9000.h b/engines/hollywood/monsters/scenes/intro/scene9000.h
index 3559f6d5676..805e78d6048 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9000.h
+++ b/engines/hollywood/monsters/scenes/intro/scene9000.h
@@ -40,7 +40,7 @@ public:
private:
bool load();
bool loadChunk(uint chunkIndex);
- bool runChunk();
+ bool runChunk(); // Returns false if interrupted.
void stopAudio() override;
void resetChunkState();
Commit: f305568a1bfec149a5ec899f61cdaf089d437d00
https://github.com/scummvm/scummvm/commit/f305568a1bfec149a5ec899f61cdaf089d437d00
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-31T09:25:47+01:00
Commit Message:
HOLLYWOOD: fix object labels when switching languages
Changed paths:
engines/hollywood/monsters/gameplay/hotspots.cpp
engines/hollywood/monsters/gameplay/hotspots.h
engines/hollywood/monsters/scenes/playable/playable_scene.cpp
diff --git a/engines/hollywood/monsters/gameplay/hotspots.cpp b/engines/hollywood/monsters/gameplay/hotspots.cpp
index 986d0e6a56c..c1d7ad19bfb 100644
--- a/engines/hollywood/monsters/gameplay/hotspots.cpp
+++ b/engines/hollywood/monsters/gameplay/hotspots.cpp
@@ -119,7 +119,7 @@ bool SceneHotspotTable::load(const Common::Array<byte> &paletteMapBlock, const C
}
}
- _stageSmallRows = stageSmallRows;
+ setItemNames(stageSmallRows);
return true;
}
@@ -222,6 +222,10 @@ void SceneHotspotTable::setItemName(byte itemId, const Common::String &name) {
_itemNameOverrides[itemId] = name;
}
+void SceneHotspotTable::setItemNames(const Common::Array<byte> &stageSmallRows) {
+ _stageSmallRows = stageSmallRows;
+}
+
void SceneHotspotTable::setActionTarget(byte itemId, const ScenePoint &interactionPoint, const ScenePoint &approachPoint) {
if (itemId >= _actionTargets.size())
return;
diff --git a/engines/hollywood/monsters/gameplay/hotspots.h b/engines/hollywood/monsters/gameplay/hotspots.h
index e402ed75443..81f49775644 100644
--- a/engines/hollywood/monsters/gameplay/hotspots.h
+++ b/engines/hollywood/monsters/gameplay/hotspots.h
@@ -72,6 +72,7 @@ public:
SceneActionTarget actionTarget(byte itemId) const;
void setItemDefaultStrip(byte itemId, byte stripIndex);
void setItemName(byte itemId, const Common::String &name);
+ void setItemNames(const Common::Array<byte> &stageSmallRows);
void setActionTarget(byte itemId, const ScenePoint &interactionPoint, const ScenePoint &approachPoint);
void setActionInteraction(byte itemId, const ScenePoint &interactionPoint, byte facing);
// Claims pixels even when the resource maps them to another item.
diff --git a/engines/hollywood/monsters/scenes/playable/playable_scene.cpp b/engines/hollywood/monsters/scenes/playable/playable_scene.cpp
index 8f0a04e6623..ddabff45c57 100644
--- a/engines/hollywood/monsters/scenes/playable/playable_scene.cpp
+++ b/engines/hollywood/monsters/scenes/playable/playable_scene.cpp
@@ -2096,6 +2096,7 @@ void PlayableScene::refreshTranslatedText() {
return;
}
applySceneStateToHotspotsAndPatches(0xff);
+ _hotspots.setItemNames(_stage003SmallRows);
}
bool PlayableScene::shouldExitGameplayLoop() const {
More information about the Scummvm-git-logs
mailing list