[Scummvm-git-logs] scummvm master -> ea16a8c814fc693455fdf71b293d978c094f3adf

neuromancer noreply at scummvm.org
Wed Oct 28 06:56:22 UTC 2026


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

Summary:
a633f1424f HOLLYWOOD: fix incorrect color pixels in scene 9010
8e523c397a HOLLYWOOD: fix some missing boot params in the intro
4f6a709687 HOLLYWOOD: cleaned some old animation code in scene 9100
ea16a8c814 HOLLYWOOD: added english strings


Commit: a633f1424f1f05f2d32dc1186e9017bc2ef303e7
    https://github.com/scummvm/scummvm/commit/a633f1424f1f05f2d32dc1186e9017bc2ef303e7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-28T07:56:05+01:00

Commit Message:
HOLLYWOOD: fix incorrect color pixels in scene 9010

Changed paths:
    engines/hollywood/monsters/scenes/intro/scene9010.cpp


diff --git a/engines/hollywood/monsters/scenes/intro/scene9010.cpp b/engines/hollywood/monsters/scenes/intro/scene9010.cpp
index 8763c45d94a..2f7d392af4c 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9010.cpp
+++ b/engines/hollywood/monsters/scenes/intro/scene9010.cpp
@@ -35,8 +35,8 @@ const char *const kStage003ArchiveName = "RESOURCE.003";
 const uint16 kPostIntroMusicCueId = 0x000e;
 const uint kStage901Index = 901;
 const uint16 kScene9010SpeechRowIndex = 1;
-const byte kScene9010SpeechTextColor = 0x7a;
-const byte kPaletteFadeExcludedIndex = 122;
+// The background and character sprites leave this palette entry unused.
+const byte kScene9010SpeechTextColor = 0xff;
 
 const byte kCharacterDescriptorSequence[] = {
 	0x0f, 0x0d, 0x0e, 0x10, 0x00, 0x01, 0x02, 0x03,
@@ -515,7 +515,7 @@ void Scene9010::updateScene9010PaletteFade() {
 		return;
 
 	for (uint paletteIndex = 0; paletteIndex < 256; ++paletteIndex) {
-		if (paletteIndex == kPaletteFadeExcludedIndex)
+		if (paletteIndex == kScene9010SpeechTextColor)
 			continue;
 
 		for (uint channel = 0; channel < 3; ++channel) {


Commit: 8e523c397a5ac2bb35c43bda4e347d05e3eb796b
    https://github.com/scummvm/scummvm/commit/8e523c397a5ac2bb35c43bda4e347d05e3eb796b
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-28T07:56:05+01:00

Commit Message:
HOLLYWOOD: fix some missing boot params in the intro

Changed paths:
    engines/hollywood/monsters/hollywood.cpp


diff --git a/engines/hollywood/monsters/hollywood.cpp b/engines/hollywood/monsters/hollywood.cpp
index 4e369bb87f1..20802465140 100644
--- a/engines/hollywood/monsters/hollywood.cpp
+++ b/engines/hollywood/monsters/hollywood.cpp
@@ -67,7 +67,7 @@ void initializeDemoGameState(GameplayState &state) {
 }
 
 bool isImplementedIntroSceneNumber(int sceneNumber) {
-	return sceneNumber == 9000 || sceneNumber == 9010 || sceneNumber == 9030 || sceneNumber == 9050 ||
+	return sceneNumber == 9000 || sceneNumber == 9010 || sceneNumber == 9050 ||
 		sceneNumber == 9100 || sceneNumber == 9110 || sceneNumber == 9120;
 }
 
@@ -237,7 +237,11 @@ Common::Error HollywoodEngine::run() {
 		debugC(1, kDebugGeneral, "Loaded startup save slot %d", startupLoadSlot);
 	}
 
-	const int bootParam = startupLoad ? 0 : ConfMan.getInt("boot_param");
+	int bootParam = startupLoad ? 0 : ConfMan.getInt("boot_param");
+	if (bootParam == 9030) {
+		warning("Scene 9030 requires the preceding scene; starting from scene 9010 instead");
+		bootParam = 9010;
+	}
 	if (!startupLoad && isDemo() && getLanguage() == Common::ES_ESP &&
 			(bootParam == 255 || bootParam == 9001)) {
 		return playSpanishDemoEnding(this, bootParam == 9001) ?
@@ -274,10 +278,6 @@ Common::Error HollywoodEngine::run() {
 				if (!scene9030.play())
 					return Common::kReadingFailed;
 			}
-		} else if (shouldRunSceneForBootParam(bootParam, 9030, bootSceneReached)) {
-			Scene9030 scene9030(this);
-			if (!scene9030.play())
-				return Common::kReadingFailed;
 		}
 
 		if (shouldRunSceneForBootParam(bootParam, 9100, bootSceneReached)) {


Commit: 4f6a7096878706b7f07337b5aaebb557594e3586
    https://github.com/scummvm/scummvm/commit/4f6a7096878706b7f07337b5aaebb557594e3586
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-28T07:56:06+01:00

Commit Message:
HOLLYWOOD: cleaned some old animation code in scene 9100

Changed paths:
    engines/hollywood/monsters/scenes/intro/scene9100.cpp
    engines/hollywood/monsters/scenes/intro/scene9100.h


diff --git a/engines/hollywood/monsters/scenes/intro/scene9100.cpp b/engines/hollywood/monsters/scenes/intro/scene9100.cpp
index 54b2924c6e8..fadaea38649 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9100.cpp
+++ b/engines/hollywood/monsters/scenes/intro/scene9100.cpp
@@ -64,7 +64,6 @@ const uint kI10SueActorRunChunk = 25;
 const uint kI10SueActorDescriptorChunk = 26;
 const byte kI10SceneActorFacing = 5;
 const uint kI10SceneActorDescriptorBase = kI10SceneActorFacing * kActorCelsPerFacing;
-const uint kActorEntryFrameDelayMillis = 90;
 const uint32 kClockFrameIntervalMillis = 1000;
 const uint32 kTalkingFrameIntervalMillis = 125;
 const uint32 kEntryPathFrameIntervalMillis = 60;
@@ -120,8 +119,10 @@ bool Scene9100::play() {
 	if (!load(false))
 		return false;
 
+	// Prepare the opening frame offscreen before revealing it through the curtain.
 	memcpy(_sceneFramebuffer.data(), _frameDecodeBuffer.data(), _frameDecodeBuffer.size());
-	runEntryActorAnimations();
+	applyActorHighlightColor(0x3f, 0x3f, 0x3f);
+	drawActorFrame(_actorBankI10Ron, kI10SceneActorFacing, 0, 0x307, 0x1d4);
 	_clockVisible = true;
 	drawInitialForegroundFrame();
 	memcpy(_savedFramebuffer.data(), _sceneFramebuffer.data(), _sceneFramebuffer.size());
@@ -339,40 +340,6 @@ void Scene9100::applyActorHighlightColor(byte highlightRed, byte highlightGreen,
 	_paletteCurrent[0x2f9] = highlightBlue;
 }
 
-void Scene9100::runEntryActorAnimations() {
-	IndexedSurfaceBuffer baseFramebuffer;
-	baseFramebuffer.resize(_sceneFramebuffer.size());
-	memcpy(baseFramebuffer.data(), _sceneFramebuffer.data(), baseFramebuffer.size());
-
-	applyActorHighlightColor(0x3f, 0x3f, 0x3f);
-	playEntryActorAnimation(_actorBankI10Ron, 0x307, 0x1d4, baseFramebuffer);
-
-	memcpy(_sceneFramebuffer.data(), baseFramebuffer.data(), _sceneFramebuffer.size());
-}
-
-void Scene9100::playEntryActorAnimation(const ActorSpriteBank &bank, int worldX, int worldY, IndexedSurfaceBuffer &baseFramebuffer) {
-	const byte kFacingTurnToCamera = 5;
-	const byte kTurnCel = 2;
-	const byte kFinalCel = 0;
-	const byte kFrames[][2] = {
-		{ kFacingTurnToCamera, kTurnCel },
-		{ kFacingTurnToCamera, kFinalCel }
-	};
-
-	if (bank.descriptors.size() < kActorDescriptorCount || bank.runStreams.size() < kActorFacingCount * kActorFacingRunStride)
-		return;
-
-	for (uint i = 0; i < ARRAYSIZE(kFrames) && !_skipRequested && !Engine::shouldQuit(); ++i) {
-		memcpy(_sceneFramebuffer.data(), baseFramebuffer.data(), _sceneFramebuffer.size());
-		drawActorFrame(bank, kFrames[i][0], kFrames[i][1], worldX, worldY);
-		presentFrame();
-		if (delay(kActorEntryFrameDelayMillis))
-			return;
-	}
-
-	memcpy(baseFramebuffer.data(), _sceneFramebuffer.data(), baseFramebuffer.size());
-}
-
 void Scene9100::runRonEntryConversation() {
 	const SceneSpeechCue popup = _text.stageCue(0, 2);
 	const uint segmentCount = MAX<uint>(1, popup.continuationCount);
diff --git a/engines/hollywood/monsters/scenes/intro/scene9100.h b/engines/hollywood/monsters/scenes/intro/scene9100.h
index 7c57153f708..20958b33035 100644
--- a/engines/hollywood/monsters/scenes/intro/scene9100.h
+++ b/engines/hollywood/monsters/scenes/intro/scene9100.h
@@ -76,8 +76,6 @@ private:
 	bool loadI10ActorBank(uint runStreamChunkIndex, uint descriptorChunkIndex, ActorSpriteBank &bank);
 
 	void applyActorHighlightColor(byte highlightRed, byte highlightGreen, byte highlightBlue);
-	void runEntryActorAnimations();
-	void playEntryActorAnimation(const ActorSpriteBank &bank, int worldX, int worldY, IndexedSurfaceBuffer &baseFramebuffer);
 	void runRonEntryConversation();
 	void drawRonEntryPathFrame(uint32 pathElapsedMillis, uint32 pathDurationMillis,
 		bool playFootstep = false);


Commit: ea16a8c814fc693455fdf71b293d978c094f3adf
    https://github.com/scummvm/scummvm/commit/ea16a8c814fc693455fdf71b293d978c094f3adf
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-28T07:56:06+01:00

Commit Message:
HOLLYWOOD: added english strings

Changed paths:
    engines/hollywood/monsters/game_strings.cpp
    engines/hollywood/monsters/game_strings.h


diff --git a/engines/hollywood/monsters/game_strings.cpp b/engines/hollywood/monsters/game_strings.cpp
index 44d0dbda9d1..41933675532 100644
--- a/engines/hollywood/monsters/game_strings.cpp
+++ b/engines/hollywood/monsters/game_strings.cpp
@@ -19,6 +19,8 @@
  *
  */
 
+#include "common/config-manager.h"
+
 #include "hollywood/monsters/game_strings.h"
 
 namespace Hollywood {
@@ -99,11 +101,62 @@ const HollywoodGameStrings kItalianGameStrings = {
 		"Crepa", "Capanno", "Scale", "Cascata", "Ascensore" }
 };
 
+const HollywoodGameStrings kEnglishGameStrings = {
+	{ " to", "Walk to", "Talk with", "Take", "Look at", "Use", "Open", "Close", "Give" },
+	{ "", "", "Talk", "Take", "Look", "Use", "Open", "Close", "Give" },
+	" to",
+	" with",
+	"Inventory",
+
+	"Save",
+	"Load",
+	"Quit",
+	"Play",
+	"Music ON",
+	"Music OFF",
+	"SFX ON",
+	"SFX OFF",
+	"Test ON",
+	"Test OFF",
+	"Music volume",
+	"SFX volume",
+	"Speech volume",
+	"Text speed",
+	"Text",
+	"Speech",
+	"Both",
+	"Are you sure?",
+	"Y",
+	"N",
+
+	" passage",
+	" wide coffin",
+	" records",
+	" Change drink",
+	" Open tap",
+	" Stop making cocktails",
+	{ "Damaged tunnel", "Camp", "Miner", "Overturned cart",
+		"Crack", "Hut", "Stairs", "Waterfall", "Elevator" }
+};
+
 const HollywoodGameStrings &getGameStrings(Common::Language language) {
-	if (language == Common::IT_ITA)
-		return kItalianGameStrings;
+	if (ConfMan.hasKey("language")) {
+		const Common::Language selectedLanguage = Common::parseLanguage(ConfMan.get("language"));
+		if (selectedLanguage == Common::EN_ANY || selectedLanguage == Common::EN_GRB ||
+				selectedLanguage == Common::EN_USA)
+			language = selectedLanguage;
+	}
 
-	return kSpanishGameStrings;
+	switch (language) {
+	case Common::EN_ANY:
+	case Common::EN_GRB:
+	case Common::EN_USA:
+		return kEnglishGameStrings;
+	case Common::IT_ITA:
+		return kItalianGameStrings;
+	default:
+		return kSpanishGameStrings;
+	}
 }
 
 } // End of namespace Hollywood
diff --git a/engines/hollywood/monsters/game_strings.h b/engines/hollywood/monsters/game_strings.h
index 23c0efd3ffc..a84fa5cd364 100644
--- a/engines/hollywood/monsters/game_strings.h
+++ b/engines/hollywood/monsters/game_strings.h
@@ -33,9 +33,9 @@ enum {
 /**
  * In-game text not supplied by RESOURCE.003, including localized executable strings.
  *
- * These strings follow the detected game language. ScummVM's translation
- * manager is reserved for launcher and engine UI that is independent of the
- * selected game release.
+ * These strings follow the detected game language unless English is explicitly
+ * selected for a fan translation. ScummVM's translation manager is reserved for
+ * launcher and engine UI that is independent of the selected game release.
  */
 struct HollywoodGameStrings {
 	const char *actionCaptions[kGameActionCaptionCount];




More information about the Scummvm-git-logs mailing list