[Scummvm-cvs-logs] scummvm master -> 56423709482a54f6b65488b80bd674b1965c48c2

[m-kiewitz]

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:
5642370948 SHERLOCK: SS: don't setup font for non-play demo


Commit: 56423709482a54f6b65488b80bd674b1965c48c2
    https://github.com/scummvm/scummvm/commit/56423709482a54f6b65488b80bd674b1965c48c2
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-30T21:07:16+01:00

Commit Message:
SHERLOCK: SS: don't setup font for non-play demo

Do not setup font for non-playable demo
Non-playable demo does not have any font at all
Fixes non-playable demo not working

Changed paths:
    engines/sherlock/fonts.cpp



diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 4d0991a..9b58eea 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -53,6 +53,15 @@ void Fonts::setFont(int fontNum) {
 	// Discard previous font
 	delete _font;
 
+	if (IS_SERRATED_SCALPEL) {
+		// Scalpel
+		if ((_vm->isDemo()) && (!_vm->_interactiveFl)) {
+			// Do not set up any font for the non-interactive demo of scalpel
+			// The non-interactive demo does not contain any font at all
+			return;
+		}
+	}
+
 	Common::String fontFilename;
 
 	if (_vm->getPlatform() != Common::kPlatform3DO) {