[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.110,1.111 smush_player.h,1.25,1.26

[Eugene Sandulenko]

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

Modified Files:
	smush_player.cpp smush_player.h 
Log Message:
o Fix bug #892909 (Unable to get Hover Lift at Gorge)
o Fix bug with transition from vista to ranch


Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- smush_player.cpp	2 Feb 2004 22:40:20 -0000	1.110
+++ smush_player.cpp	9 Feb 2004 18:57:04 -0000	1.111
@@ -1012,7 +1012,7 @@
 	_frame = contFrame;
 }
 
-void SmushPlayer::play(const char *filename, const char *directory) {
+void SmushPlayer::play(const char *filename, const char *directory, int32 offset, int32 startFrame) {
 
 	// Verify the specified file exists
 	File f;
@@ -1032,6 +1032,12 @@
 	setupAnim(filename, directory);
 	init();
 
+	if (offset) {
+		_base->seek(offset - 8, FileChunk::seek_start);
+		_frame = startFrame;
+		_middleAudio = true;
+	}
+
 	while (true) {
 		_vm->parseEvents();
 		_vm->processKbd(true);

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- smush_player.h	2 Feb 2004 22:40:20 -0000	1.25
+++ smush_player.h	9 Feb 2004 18:57:05 -0000	1.26
@@ -74,7 +74,7 @@
 	SmushPlayer(ScummEngine_v6 *scumm, int speed);
 	~SmushPlayer();
 
-	void play(const char *filename, const char *directory);
+	void play(const char *filename, const char *directory, int32 offset = 0, int32 startFrame = 0);
 
 protected:
 	SmushFont *_sf[5];