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

[bluegr]

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

Summary:
eea066b89b ILLUSIONS: DUCKMAN: Add support for the demo version (#1413)


Commit: eea066b89b3279d8a754f3d3da1ac8a190904196
    https://github.com/scummvm/scummvm/commit/eea066b89b3279d8a754f3d3da1ac8a190904196
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-12-04T01:54:24+02:00

Commit Message:
ILLUSIONS: DUCKMAN: Add support for the demo version (#1413)

Changed paths:
    engines/illusions/detection.cpp
    engines/illusions/duckman/duckman_videoplayer.cpp


diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index cf771f8..3a9c77e 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -70,6 +70,19 @@ static const IllusionsGameDescription gameDescriptions[] = {
 	{
 		{
 			"duckman",
+			"Demo",
+			AD_ENTRY1s("duckman.gam", "71d01e3f3d9d4e51cd69f71028745610", 7127040),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_DROPPLATFORM | ADGF_DEMO,
+			GUIO0()
+		},
+		kGameIdDuckman
+	},
+
+	{
+		{
+			"duckman",
 			0,
 			AD_ENTRY1s("duckman.gam", "64d16922ffb46b746fc2c12a14d75bcc", 29779968),
 			Common::DE_DEU,
diff --git a/engines/illusions/duckman/duckman_videoplayer.cpp b/engines/illusions/duckman/duckman_videoplayer.cpp
index ae17d32..b2ccd63 100644
--- a/engines/illusions/duckman/duckman_videoplayer.cpp
+++ b/engines/illusions/duckman/duckman_videoplayer.cpp
@@ -69,7 +69,7 @@ void DuckmanVideoPlayer::update() {
 	} else if (_videoDecoder->needsUpdate()) {
 		const Graphics::Surface *frame = _videoDecoder->decodeNextFrame();
 		Graphics::Surface *backSurface = _vm->_screen->getBackSurface();
-		if (frame->format.bytesPerPixel == g_system->getScreenFormat().bytesPerPixel) {
+		if (frame && frame->format.bytesPerPixel == g_system->getScreenFormat().bytesPerPixel) {
 			const int width = MIN(frame->w, backSurface->w);
 			const int height = MIN(frame->h, backSurface->h);
 			const byte *src = (const byte*)frame->getPixels();