[Scummvm-cvs-logs] CVS: residual driver_gl.h,1.1,1.2 scene.cpp,1.17,1.18 smush.cpp,1.9,1.10

[James Brown]

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

Modified Files:
	driver_gl.h scene.cpp smush.cpp 
Log Message:
Make things compile again. Allow escape to skip smush cutscenes.


Index: driver_gl.h
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- driver_gl.h	23 Jan 2004 11:10:21 -0000	1.1
+++ driver_gl.h	29 Jan 2004 13:03:07 -0000	1.2
@@ -13,8 +13,8 @@
 	public:
 		Driver(int screenW, int screenH, int screenBPP);
 
-		void setupCamera(float fov, float nclip, float fclip);
-		void positionCamera(float roll, Vector3d pos, Vector3d interest);
+		void setupCamera(float fov, float nclip, float fclip, float roll);
+		void positionCamera(Vector3d pos, Vector3d interest);
 
 		void clearScreen(); 
 		void flipBuffer();

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scene.cpp	23 Jan 2004 11:10:59 -0000	1.17
+++ scene.cpp	29 Jan 2004 13:03:07 -0000	1.18
@@ -144,8 +144,8 @@
 }
 
 void Scene::Setup::setupCamera() const {
-  g_driver->setupCamera(fov_, nclip_, fclip_);
-  g_driver->positionCamera(roll_, pos_, interest_);
+  g_driver->setupCamera(fov_, nclip_, fclip_, roll_);
+  g_driver->positionCamera(pos_, interest_);
 }
 
 void Scene::setSetup(int num)

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smush.cpp	28 Jan 2004 08:09:11 -0000	1.9
+++ smush.cpp	29 Jan 2004 13:03:07 -0000	1.10
@@ -333,7 +333,11 @@
 		
 		SDL_Event event;
 		while (SDL_PollEvent(&event)) {
-	    }
+			// Skip cutscene?
+			if (event.type == SDL_KEYDOWN)
+				if (event.key.keysym.sym == SDLK_ESCAPE)
+					_videoFinished = true;
+		}
 		SDL_Delay(10);
 	};
 	deinit();