o Fix bug #892909 (Unable to get Hover Lift at Gorge)

o Fix bug with transition from vista to ranch

svn-id: r12799

2 files changed, 8 insertions, 2 deletions

diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 13c0c677f3..a0dd10433d 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -1012,7 +1012,7 @@ void SmushPlayer::seekSan(const char *file, const char *directory, int32 pos, in
 	_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 @@ void SmushPlayer::play(const char *filename, const char *directory) {
 	setupAnim(filename, directory);
 	init();
 
+	if (offset) {
+		_base->seek(offset - 8, FileChunk::seek_start);
+		_frame = startFrame;
+		_middleAudio = true;
+	}
+
 	while (true) {
 		_vm->parseEvents();
 		_vm->processKbd(true);
diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h
index b790f93ab1..5b0cd7e119 100644
--- a/scumm/smush/smush_player.h
+++ b/scumm/smush/smush_player.h
@@ -74,7 +74,7 @@ public:
 	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];