[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.17,1.18 insane.h,1.11,1.12 insane_scenes.cpp,1.13,1.14

[Eugene Sandulenko]

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

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


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- insane.cpp	6 Feb 2004 21:05:58 -0000	1.17
+++ insane.cpp	9 Feb 2004 18:57:03 -0000	1.18
@@ -597,7 +597,9 @@
 }
 
 void Insane::startVideo(const char *filename, int num, int argC, int frameRate, 
-						 int doMainLoop, byte *fluPtr, int32 numFrames) {
+						 int doMainLoop, byte *fluPtr, int32 startFrame) {
+	int32 offset = 0;
+
 	_smush_curFrame = 0;
 	_smush_isSanFileSetup = 0;
 	_smush_setupsan4 = 0;
@@ -605,14 +607,13 @@
 	_smush_setupsan1 = 0;
 	_smush_setupsan17 = 0;
 
-
 	if (fluPtr) {
-		smush_setupSanWithFlu(filename, 0, -1, -1, 0, fluPtr, numFrames);
+		offset = smush_setupSanWithFlu(filename, 0, -1, -1, 0, fluPtr, startFrame);
 	} else {
 		smush_setupSanFromStart(filename, 0, -1, -1, 0);
 	}
 
-	_player->play(filename, _vm->getGameDataPath());
+	_player->play(filename, _vm->getGameDataPath(), offset, startFrame);
 }
 
 void Insane::smush_warpMouse(int x, int y, int buttons) {
@@ -1381,7 +1382,7 @@
 	_vm->writeArray(_numberArray, 0, item, value);
 }
 
-void Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, 
+int32 Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, 
 								   int32 step2, int32 setupsan1, byte *fluPtr, 
 								   int32 numFrames) {
 	byte *tmp = fluPtr;
@@ -1419,6 +1420,8 @@
 	_smush_curFrame = numFrames;
 	smush_setFrameSteps(step1, step2);
 	smush_warpMouse(160, 100, -1);
+
+	return offset;
 }
 
 void Insane::smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1, 

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- insane.h	6 Feb 2004 21:05:58 -0000	1.11
+++ insane.h	9 Feb 2004 18:57:03 -0000	1.12
@@ -271,7 +271,7 @@
 	void initvars(void);
 	void readFileToMem(const char *name, byte **buf);
 	void startVideo(const char *filename, int num, int argC, int frameRate, 
-					 int doMainLoop, byte *fluPtr = 0, int32 numFrames = 0);
+					 int doMainLoop, byte *fluPtr = 0, int32 startFrame = 0);
 	void smush_warpMouse(int x, int y, int buttons);
 	void putActors(void);
 	void readState(void);
@@ -418,7 +418,7 @@
 	void reinitActors(void);
 	const char *handleTrsTag(int32 trsId);
 	void ouchSoundBen(void);
-	void smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, 
+	int32 smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, 
 							   int32 step2, int32 setupsan1, byte *fluPtr, int32 numFrames);
 	void smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1, 
 								 int32 step2, int32 setupsan1);

Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- insane_scenes.cpp	6 Feb 2004 21:05:58 -0000	1.13
+++ insane_scenes.cpp	9 Feb 2004 18:57:03 -0000	1.14
@@ -1184,6 +1184,7 @@
 				writeArray(1, _val57d);
 				smush_setToFinish();
 			} else {
+				writeArray(4, 1);
 				queueSceneSwitch(15, 0, "chasout.san", 64, 0, 0, 0);
 			}
 		}