[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.276,1.277 scummvm.cpp,2.300,2.301

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22057a/scumm

Modified Files:
	scumm.h scummvm.cpp 
Log Message:

Add option for the demo included in Maniac Mansion (Classic version)


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- scumm.h	28 Jul 2003 16:55:06 -0000	1.276
+++ scumm.h	29 Jul 2003 12:13:39 -0000	1.277
@@ -1065,6 +1065,7 @@
 	byte _charsetBuffer[512];
 
 public:
+	bool _demo_mode;
 	bool _noSubtitles;	// Whether to skip all subtitles
 	bool _confirmExit;
 protected:

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.300
retrieving revision 2.301
diff -u -d -r2.300 -r2.301
--- scummvm.cpp	28 Jul 2003 16:56:52 -0000	2.300
+++ scummvm.cpp	29 Jul 2003 12:13:39 -0000	2.301
@@ -393,6 +393,7 @@
 	memset(_charsetData, 0, sizeof(_charsetData));
 	_charsetBufPos = 0;
 	memset(_charsetBuffer, 0, sizeof(_charsetBuffer));
+	_demo_mode = false;
 	_noSubtitles = false;
 	_confirmExit = false;
 	_numInMsgStack = 0;
@@ -545,6 +546,7 @@
 	_version = detector->_game.version;
 	setFeatures(detector->_game.features);
 
+	_demo_mode = detector->_demo_mode;
 	_noSubtitles = detector->_noSubtitles;
 	_confirmExit = detector->_confirmExit;
 	_defaultTalkDelay = detector->_talkSpeed;
@@ -826,7 +828,10 @@
 
 	// If requested, load a save game instead of running the boot script
 	if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveLoadCompatible)) {
-		runScript(1, 0, 0, &_bootParam);
+		if (_gameId == GID_MANIAC && _demo_mode)
+			runScript(9, 0, 0, &_bootParam);
+		else
+			runScript(1, 0, 0, &_bootParam);
 	}
 	_saveLoadFlag = 0;
 }