[Scummvm-git-logs] scummvm master -> 9e4ddd10c1138a2246c3c0ce6ede51a5a06786cb

[NMIError]

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

Summary:
78b66ad14f TOON: Make Virgin logo movie optional for demo
4425437ad2 TOON: Skip main menu for demo
9e4ddd10c1 TOON: Add "Demo" to demo version descriptions


Commit: 78b66ad14fd7510ade56565622c1f59c613f2d35
    https://github.com/scummvm/scummvm/commit/78b66ad14fd7510ade56565622c1f59c613f2d35
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-08-30T22:33:04+02:00

Commit Message:
TOON: Make Virgin logo movie optional for demo

Not all demo versions seem to include the Virgin logo movie, so skip playing it
if it does not exist.

Changed paths:
    engines/toon/movie.cpp
    engines/toon/toon.cpp


diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index a706456c91..4963e7e9d9 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -87,8 +87,11 @@ void Movie::play(const Common::String &video, int32 flags) {
 	_playing = true;
 	if (flags & 1)
 		_vm->getAudioManager()->setMusicVolume(0);
-	if (!_decoder->loadFile(video.c_str()))
+	if (!_decoder->loadFile(video.c_str())) {
+		if (flags & 2)
+			return;
 		error("Unable to play video %s", video.c_str());
+	}
 	_subtitle->load(video.c_str());
 	playVideo(isFirstIntroVideo);
 	_vm->flushPalette(true);
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 9f1df2da92..ce11eb1fd4 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -1132,7 +1132,8 @@ Common::Error ToonEngine::run() {
 	if (!loadedGame) {
 
 		// play producer intro
-		getMoviePlayer()->play("VIELOGOM.SMK", 0x10);
+		// not all demo versions include the logo video
+		getMoviePlayer()->play("VIELOGOM.SMK", _isDemo ? 0x12 : 0x10);
 
 		// show mainmenu
 		if (!showMainmenu(loadedGame)) {


Commit: 4425437ad2fe51332b6d157d1fe143fb476ef498
    https://github.com/scummvm/scummvm/commit/4425437ad2fe51332b6d157d1fe143fb476ef498
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-08-30T22:33:05+02:00

Commit Message:
TOON: Skip main menu for demo

The demo version of the game does not have a main menu; it immediately starts a
new game.

Changed paths:
    engines/toon/toon.cpp


diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index ce11eb1fd4..f59d2289af 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -1136,7 +1136,8 @@ Common::Error ToonEngine::run() {
 		getMoviePlayer()->play("VIELOGOM.SMK", _isDemo ? 0x12 : 0x10);
 
 		// show mainmenu
-		if (!showMainmenu(loadedGame)) {
+		// the demo does not have a menu and starts a new game right away
+		if (!_isDemo && !showMainmenu(loadedGame)) {
 			return Common::kNoError;
 		}
 	}


Commit: 9e4ddd10c1138a2246c3c0ce6ede51a5a06786cb
    https://github.com/scummvm/scummvm/commit/9e4ddd10c1138a2246c3c0ce6ede51a5a06786cb
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-08-30T22:33:05+02:00

Commit Message:
TOON: Add "Demo" to demo version descriptions

Changed paths:
    engines/toon/detection.cpp


diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index ce3b0e2721..84e2cc9112 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -99,7 +99,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::RU_RUS, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOMIDI)
 	},
 	{
-		"toon", "",
+		"toon", "Demo",
 		{
 			{"local.pak", 0, "bf5da4c03f78ffbd643f12122319366e", 3250841},
 			{"wacexdbl.emc", 0, "cfbc2156a31b294b038204888407ebc8", 6974},
@@ -109,7 +109,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOMIDI)
 	},
 	{
-		"toon", "",
+		"toon", "Demo",
 		{
 			{"local.pak", 0, "8ef3368078b9ea70b305c04db826feea", 2680573},
 			{"generic.svl", 0, "5c42724bb93b360dca7044d6b7ef26e5", 7739319},