[Scummvm-git-logs] scummvm master -> 1ed70471696bc68cebc3111af705b9daddc7dca1

[bluegr]

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:
d092d362c8 GOB: Apply cursor workaround to more Delia's videos in LIT - bug #10383
1ed7047169 GOB: Show the cursor for the closeup video of Bizoo in Gob3 - bug #5381


Commit: d092d362c8bf4b3987aad72b24ba51f4f13cb004
    https://github.com/scummvm/scummvm/commit/d092d362c8bf4b3987aad72b24ba51f4f13cb004
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-29T00:38:13+02:00

Commit Message:
GOB: Apply cursor workaround to more Delia's videos in LIT - bug #10383

Also, chop off the video file suffix, as sometimes openVideo() is
called with video files that include the .IMD suffix

Changed paths:
    engines/gob/videoplayer.cpp


diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 366f54c14ee..7a07d85d605 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -137,15 +137,17 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties
 
 		// WORKAROUND: In some rare cases, the cursor should still be
 		// displayed while a video is playing.
+		Common::String videoFile = file;
+		videoFile.toUppercase();
+		if (videoFile.hasSuffix(".IMD"))
+			videoFile = videoFile.substr(0, videoFile.find('.'));
 		_noCursorSwitch = false;
+
 		if (primary && (_vm->getGameType() == kGameTypeLostInTime)) {
-			if (!file.compareToIgnoreCase("PORTA03") ||
-			    !file.compareToIgnoreCase("PORTA03A") ||
-			    !file.compareToIgnoreCase("CALE1") ||
-			    !file.compareToIgnoreCase("AMIL2") ||
-			    !file.compareToIgnoreCase("AMIL3B") ||
-			    !file.compareToIgnoreCase("DELB"))
-				_noCursorSwitch = true;
+			static const Common::StringArray videosWithCursorLIT = {
+				"PORTA03", "PORTA03A", "CALE1", "AMIL2", "AMIL3B", "DELB", "DELG"
+			};
+			_noCursorSwitch = (Common::find(videosWithCursorLIT.begin(), videosWithCursorLIT.end(), videoFile) != videosWithCursorLIT.end());
 		}
 
 		// WORKAROUND: In Woodruff, Coh Cott vanished in one video on her party.


Commit: 1ed70471696bc68cebc3111af705b9daddc7dca1
    https://github.com/scummvm/scummvm/commit/1ed70471696bc68cebc3111af705b9daddc7dca1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-29T00:38:13+02:00

Commit Message:
GOB: Show the cursor for the closeup video of Bizoo in Gob3 - bug #5381

Changed paths:
    engines/gob/videoplayer.cpp


diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 7a07d85d605..5f18b82f012 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -150,6 +150,13 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties
 			_noCursorSwitch = (Common::find(videosWithCursorLIT.begin(), videosWithCursorLIT.end(), videoFile) != videosWithCursorLIT.end());
 		}
 
+		if (primary && (_vm->getGameType() == kGameTypeGob3)) {
+			static const Common::StringArray videosWithCursorGob3 = {
+				"CAIL1", "CAIL2"
+			};
+			_noCursorSwitch = (Common::find(videosWithCursorGob3.begin(), videosWithCursorGob3.end(), videoFile) != videosWithCursorGob3.end());
+		}
+
 		// WORKAROUND: In Woodruff, Coh Cott vanished in one video on her party.
 		// This is a bug in video, so we work around it.
 		_woodruffCohCottWorkaround = false;