[Scummvm-cvs-logs] scummvm master -> f35bdb680d6271042757eb69264b2aa76b19afa7

[salty-horse]

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:
f35bdb680d TUCKER: Don't try parsing missing debug values in demo


Commit: f35bdb680d6271042757eb69264b2aa76b19afa7
    https://github.com/scummvm/scummvm/commit/f35bdb680d6271042757eb69264b2aa76b19afa7
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-03-12T21:29:10+02:00

Commit Message:
TUCKER: Don't try parsing missing debug values in demo

Fixes the demo thinking it's in debug mode and allowing ESC to quit.

Changed paths:
    engines/tucker/resource.cpp



diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 9cba7b5..d7b75e3 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -662,9 +662,11 @@ void TuckerEngine::loadData3() {
 void TuckerEngine::loadData4() {
 	loadFile("data4.c", _loadTempBuf);
 	DataTokenizer t(_loadTempBuf, _fileLoadSize);
-	t.findNextToken(kDataTokenDw);
-	_gameDebug = t.getNextInteger() != 0;
-	_displayGameHints = t.getNextInteger() != 0;
+	if ((_gameFlags & kGameFlagDemo) == 0) {
+		t.findNextToken(kDataTokenDw);
+		_gameDebug = t.getNextInteger() != 0;
+		_displayGameHints = t.getNextInteger() != 0;
+	}
 	_locationObjectsCount = 0;
 	if (t.findIndex(_locationNum)) {
 		while (t.findNextToken(kDataTokenDw)) {