[Scummvm-cvs-logs] CVS: residual driver_gl.cpp,1.9,1.10 lua.cpp,1.52,1.53

Daniel Schepler dschepler at users.sourceforge.net
Wed Mar 24 06:14:07 CET 2004


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

Modified Files:
	driver_gl.cpp lua.cpp 
Log Message:
Fix overshoot on smush movie rendering.

Fix position of movies.


Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- driver_gl.cpp	23 Mar 2004 10:38:02 -0000	1.9
+++ driver_gl.cpp	24 Mar 2004 13:02:12 -0000	1.10
@@ -235,13 +235,15 @@
 	glDepthMask(GL_FALSE);
 	glEnable(GL_SCISSOR_TEST);
 
+	glScissor(offsetX, 480 - (offsetY + _smushHeight),
+		  _smushWidth, _smushHeight);
+
 	int curTexIdx = 0;
 	for (int y = 0; y < _smushHeight; y += BITMAP_TEXTURE_SIZE) {
 		for (int x = 0; x < _smushWidth; x += BITMAP_TEXTURE_SIZE) {
 			int t_width = (x + BITMAP_TEXTURE_SIZE >= _smushWidth) ? (_smushWidth - x) : BITMAP_TEXTURE_SIZE;
 			int t_height = (y + BITMAP_TEXTURE_SIZE >= _smushHeight) ? (_smushHeight - y) : BITMAP_TEXTURE_SIZE;
 			glBindTexture(GL_TEXTURE_2D, _smushTexIds[curTexIdx]);
-			glScissor(x + offsetX, 480 - (y + t_height + offsetY), x + offsetX + t_width, 480 - (y + offsetY));
 			glBegin(GL_QUADS);
 			glTexCoord2f(0, 0);
 			glVertex2i(x + offsetX, y + offsetY);

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- lua.cpp	24 Mar 2004 02:43:59 -0000	1.52
+++ lua.cpp	24 Mar 2004 13:02:14 -0000	1.53
@@ -1094,11 +1094,11 @@
 	int x = 0;
 	int y = 0;
 
-	if (!lua_isnil(lua_getparam(4)))
-		x = check_int(4);
-
 	if (!lua_isnil(lua_getparam(3)))
-		y = check_int(3);
+		x = check_int(3);
+
+	if (!lua_isnil(lua_getparam(4)))
+		y = check_int(4);
 
 	Engine::instance()->setMode(ENGINE_MODE_NORMAL);
 	pushbool(g_smush->play(luaL_check_string(1), x, y));





More information about the Scummvm-git-logs mailing list