[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.54.2.1,1.54.2.2

[Torbj?rn Andersson]

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

Modified Files:
      Tag: branch-0-6-0
	anims.cpp 
Log Message:
Removed the test for non-existing demo cutscenes: param[0] is an offset
into the chunk of memory handled by the memory manager, not a well-defined
value. Also, it introduced a theoretical memory leak as fnPlaySequence()
wouldn't get to clean up after itself.

The correct place for this check is probably in MoviePlayer::play(), where
you can test the name of the cutscene. On the other hand, the original demo
will gladly play eye.smk if there is one, so why shouldn't we?


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -d -r1.54.2.1 -r1.54.2.2
--- anims.cpp	1 Mar 2004 00:19:50 -0000	1.54.2.1
+++ anims.cpp	2 Mar 2004 07:00:40 -0000	1.54.2.2
@@ -621,10 +621,6 @@
 	// params:	0 pointer to null-terminated ascii filename
 	// 		1 number of frames in the sequence, used for PSX.
 
-	// Only two sequences exist in demo
-	if ((_vm->_features & GF_DEMO) && params[0] != 3626 && params[0] != 3879846)
-		return IR_CONT;
-
 	char filename[30];
  	uint32 rv;
 	MovieTextObject *sequenceSpeechArray[MAX_SEQUENCE_TEXT_LINES + 1];