[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.373,1.374

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6090/scumm

Modified Files:
	script_v6.cpp 
Log Message:

Re-arrange code to allow second INSANE in PC FT demo to work


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- script_v6.cpp	6 Aug 2004 15:55:12 -0000	1.373
+++ script_v6.cpp	7 Aug 2004 11:52:11 -0000	1.374
@@ -2529,19 +2529,18 @@
 			break;
 		case 6: {
 				uint32 speed;
-				assert(getStringAddressVar(VAR_VIDEONAME));
-				if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0) {
-					speed = 1000000 / 14;
-				} else {
-					if (_smushFrameRate == 0) 
-						_smushFrameRate = 14;
-					speed = 1000000 / _smushFrameRate;
-				}
+				if (_smushFrameRate == 0) 
+					_smushFrameRate = 14;
+				speed = 1000000 / _smushFrameRate;
 
 				debug(1, "INSANE Arg: %d %d", args[1], args[2]);
 
 				// INSANE mode 0: SMUSH movie playback
 				if (args[1] == 0) {
+					assert(getStringAddressVar(VAR_VIDEONAME));
+					if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
+						speed = 1000000 / 14;
+
 					SmushPlayer *sp = new SmushPlayer(this, speed);
 
 					// Correct incorrect smush filename in Macintosh FT demo