[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.13,1.14 sdl.cpp,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Mon Oct 21 15:26:05 CEST 2002


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory usw-pr-cvs1:/tmp/cvs-serv18736

Modified Files:
	sdl-common.cpp sdl.cpp 
Log Message:
fixed stupid bug by me, again (see also 9th of May)

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sdl-common.cpp	20 Oct 2002 13:17:43 -0000	1.13
+++ sdl-common.cpp	21 Oct 2002 22:25:52 -0000	1.14
@@ -749,6 +749,9 @@
 
 	if (SDL_LockSurface(_screen) == -1)
 		error("SDL_LockSurface failed: %s.\n", SDL_GetError());
+	
+	// Mark as dirty
+	add_dirty_rect(x, y, w, h);
 
 	dst = (byte *)_screen->pixels + y * _screenWidth + x;
 	while (h > 0) {
@@ -768,9 +771,6 @@
 	}
 
 	SDL_UnlockSurface(_screen);
-	
-	// Mark as dirty
-	add_dirty_rect(x, y, w, h);
 
 	// Finally, set the flag to indicate the mouse has been drawn
 	_mouseDrawn = true;

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sdl.cpp	14 Oct 2002 11:02:27 -0000	1.10
+++ sdl.cpp	21 Oct 2002 22:25:52 -0000	1.11
@@ -137,6 +137,9 @@
 	if (SDL_LockSurface(sdl_tmpscreen) == -1)
 		error("SDL_LockSurface failed: %s.\n", SDL_GetError());
 
+	// Mark as dirty
+	add_dirty_rect(x, y, w, h);
+
 	dst = (uint16 *)sdl_tmpscreen->pixels + (y+1) * TMP_SCREEN_WIDTH + (x+1);
 	while (h > 0) {
 		int width = w;
@@ -156,9 +159,6 @@
 
 	SDL_UnlockSurface(sdl_tmpscreen);
 	
-	// Mark as dirty
-	add_dirty_rect(x, y, w, h);
-
 	// Finally, set the flag to indicate the mouse has been drawn
 	_mouseDrawn = true;
 }





More information about the Scummvm-git-logs mailing list