[Scummvm-git-logs] scummvm master -> 4451101b80f07197e441cfad8cbd7fd2498b4bc8

[dwatteau]

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:
d51c9336b9 SCUMM: Add delay to "Turbo Technologies" PC Engine Loom loading screen
4451101b80 SCUMM: Restrict PC-Engine Loom loading screen delay to English version


Commit: d51c9336b940b117a147804a86ec7640ad950b72
    https://github.com/scummvm/scummvm/commit/d51c9336b940b117a147804a86ec7640ad950b72
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-08-08T11:53:59+02:00

Commit Message:
SCUMM: Add delay to "Turbo Technologies" PC Engine Loom loading screen

The original gets its delay - about 10 seconds, judging by the emulator
I tried - by loading resources. ScummVM does that in the blink of an
eye. Of course, we don't want the full delay. Just a tasteful one.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 9e8b3e88cb5..1bbb8d280f1 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -744,6 +744,19 @@ void ScummEngine_v5::o5_animateActor() {
 }
 
 void ScummEngine_v5::o5_breakHere() {
+	// WORKAROUND: The PC Engine shows a Turbo Technologies loading screen.
+	// In the Mednafen emulator it's shown for about 10 seconds while the
+	// game is loading resources. ScummVM does that in the blink of an eye.
+	//
+	// Injecting the delay into the breakHere instruction seems like the
+	// least intrusive way of adding the delay. The script calls it a number
+	// of times, but only once from room 69.
+
+	if (_game.id == GID_LOOM && _game.platform == Common::kPlatformPCEngine && vm.slot[_currentScript].number == 44 && _currentRoom == 69) {
+		vm.slot[_currentScript].delay = 120;
+		vm.slot[_currentScript].status = ssPaused;
+	}
+
 	updateScriptPtr();
 	_currentScript = 0xFF;
 }


Commit: 4451101b80f07197e441cfad8cbd7fd2498b4bc8
    https://github.com/scummvm/scummvm/commit/4451101b80f07197e441cfad8cbd7fd2498b4bc8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-08-08T11:53:59+02:00

Commit Message:
SCUMM: Restrict PC-Engine Loom loading screen delay to English version

The Japanese version shows only a blank screen, so it seems silly to
delay for that.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 1bbb8d280f1..f646902c0e7 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -744,15 +744,16 @@ void ScummEngine_v5::o5_animateActor() {
 }
 
 void ScummEngine_v5::o5_breakHere() {
-	// WORKAROUND: The PC Engine shows a Turbo Technologies loading screen.
-	// In the Mednafen emulator it's shown for about 10 seconds while the
-	// game is loading resources. ScummVM does that in the blink of an eye.
+	// WORKAROUND: The English PC Engine version of Loom shows a Turbo
+	// Technologies loading screen. In the Mednafen emulator it's shown for
+	// about 10 seconds while the game is loading resources. ScummVM does
+	// that in the blink of an eye.
 	//
 	// Injecting the delay into the breakHere instruction seems like the
 	// least intrusive way of adding the delay. The script calls it a number
 	// of times, but only once from room 69.
 
-	if (_game.id == GID_LOOM && _game.platform == Common::kPlatformPCEngine && vm.slot[_currentScript].number == 44 && _currentRoom == 69) {
+  if (_game.id == GID_LOOM && _game.platform == Common::kPlatformPCEngine && _language == Common::EN_ANY && vm.slot[_currentScript].number == 44 && _currentRoom == 69) {
 		vm.slot[_currentScript].delay = 120;
 		vm.slot[_currentScript].status = ssPaused;
 	}