[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.27,1.28 sdl.cpp,1.18,1.19 sdl_gl.cpp,1.19,1.20

Max Horn fingolfin at users.sourceforge.net
Sun Jan 12 06:19:02 CET 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv13216

Modified Files:
	sdl-common.cpp sdl.cpp sdl_gl.cpp 
Log Message:
fix for the black rect bug in COMI (thanks to Erik)... guess is that the checksum algo fails to detect the dirty regions. Why is it here at all, anyway? BBrox says it might be needed for Simon. So somebody should check that

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sdl-common.cpp	9 Jan 2003 18:39:45 -0000	1.27
+++ sdl-common.cpp	12 Jan 2003 14:18:04 -0000	1.28
@@ -123,7 +123,8 @@
 	if (_screen == NULL)
 		return;
 
-	if (((uint32)buf & 3) == 0 && pitch == _screenWidth && x==0 && y==0 && w==_screenWidth && h==_screenHeight && _mode_flags&DF_WANT_RECT_OPTIM) {
+	if (((uint32)buf & 3) == 0 && pitch == _screenWidth && x==0 && y==0 &&
+	    w==_screenWidth && h==_screenHeight && _mode_flags&DF_WANT_RECT_OPTIM) {
 		/* Special, optimized case for full screen updates.
 		 * It tries to determine what areas were actually changed,
 		 * and just updates those, on the actual display. */

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sdl.cpp	13 Dec 2002 17:43:58 -0000	1.18
+++ sdl.cpp	12 Jan 2003 14:18:04 -0000	1.19
@@ -77,7 +77,7 @@
 
 void OSystem_SDL::load_gfx_mode() {
 	_forceFull = true;
-	_mode_flags = DF_WANT_RECT_OPTIM | DF_UPDATE_EXPAND_1_PIXEL;
+	_mode_flags = DF_UPDATE_EXPAND_1_PIXEL;
 
 	_tmpscreen = NULL;
 	_tmpScreenWidth = (_screenWidth + 3);

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sdl_gl.cpp	13 Dec 2002 17:44:04 -0000	1.19
+++ sdl_gl.cpp	12 Jan 2003 14:18:05 -0000	1.20
@@ -89,7 +89,7 @@
 	Amask = 0;
 	
 	_forceFull = true;
-	_mode_flags = DF_WANT_RECT_OPTIM | DF_UPDATE_EXPAND_1_PIXEL;
+	_mode_flags = DF_UPDATE_EXPAND_1_PIXEL;
 	_scaleFactor = 2;
 
 	_tmpscreen = NULL;





More information about the Scummvm-git-logs mailing list