[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.54,1.54.2.1 function.cpp,1.56,1.56.2.1

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	anims.cpp function.cpp 
Log Message:

Add fix for error at end of sword2demo (From eriktorbjorn)
Prevent false warnings in demo.


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1
--- anims.cpp	5 Feb 2004 14:19:02 -0000	1.54
+++ anims.cpp	1 Mar 2004 00:19:50 -0000	1.54.2.1
@@ -621,6 +621,10 @@
 	// 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];

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.56
retrieving revision 1.56.2.1
diff -u -d -r1.56 -r1.56.2.1
--- function.cpp	5 Feb 2004 14:19:03 -0000	1.56
+++ function.cpp	1 Mar 2004 00:19:50 -0000	1.56.2.1
@@ -398,7 +398,7 @@
 
 	if (DEMO) {
 		_vm->closeGame();
-		return IR_CONT;
+		return IR_STOP;
 	}
 
 	// Prepare for the credits by fading down, stoping the music, etc.