[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.1,1.2 smush_player.cpp,1.66,1.67

[Eugene Sandulenko]

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

Modified Files:
	insane.cpp smush_player.cpp 
Log Message:
Make FT DOS demo happy with INSANE precompiled.
To escape within INSANE scene only option is to exit scummvm with Alt+X.


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- insane.cpp	6 Dec 2003 05:47:24 -0000	1.1
+++ insane.cpp	6 Dec 2003 06:53:14 -0000	1.2
@@ -57,6 +57,10 @@
 Insane::Insane(ScummEngine *scumm) {
 	_scumm = scumm;
 	
+	// Demo has different insane, so disable it now
+	if (_scumm->_features & GF_DEMO)
+		return;
+
 	initvars();
 
 	readFileToMem("roadrash.rip", &_smush_roadrashRip);
@@ -1127,6 +1131,10 @@
 
 	// blah();
 
+	// Demo has different insane, so disable it now
+	if (_scumm->_features & GF_DEMO)
+		return;
+	
 	_player->insanity(true);
 	_player->play(filename, _scumm->getGameDataPath());
 
@@ -4463,7 +4471,8 @@
 	struct fluConf *flu;
 
 	//if (!_ptrMainLoop) { } // We don't need it
-	if (!_insaneIsRunning) {
+ 	// Demo has different insane, so disable it now
+	if (!_insaneIsRunning || _scumm->_features & GF_DEMO) {
 		smush_setToFinish();
 		return;
 	}

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- smush_player.cpp	6 Dec 2003 05:47:24 -0000	1.66
+++ smush_player.cpp	6 Dec 2003 06:53:14 -0000	1.67
@@ -843,7 +843,8 @@
 	handleAnimHeader(*sub);
 
 	if (_insanity)
-		readString("mineroad.trs", directory);
+		if(!(_scumm->_features & GF_DEMO))
+			readString("mineroad.trs", directory);
 	else
 		readString(file, directory);