[Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.25,1.26 resman.cpp,1.44,1.45

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Sep 27 08:45:10 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv30368

Modified Files:
	build_display.cpp resman.cpp 
Log Message:
Removed CopyScreenBuffer() since it was a no-op anyway.


Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- build_display.cpp	27 Sep 2003 11:02:56 -0000	1.25
+++ build_display.cpp	27 Sep 2003 15:44:26 -0000	1.26
@@ -304,8 +304,6 @@
 		rv = DrawSprite(&spriteInfo);
 		if (rv)
 			error("Driver Error %.8x (drawing console)", rv);
-
-		CopyScreenBuffer();
 	} else{
 		StartConsole();
 		// force the palette
@@ -379,8 +377,6 @@
 	pal[187].blue = 255;
 	BS2_SetPalette(0, 256, (uint8 *) pal, RDPAL_FADE);
 
-	CopyScreenBuffer();
-
 	FadeUp((float) 0.75);
 
 	Free_mem(text_spr);
@@ -401,7 +397,6 @@
 		// Drivers change the y co-ordinate, don't know why...
 		spriteInfo.y = oldY;
 		spriteInfo.x = oldX;
-		CopyScreenBuffer();
 	}
 
 	BS2_SetPalette(0, 256, (uint8 *) oldPal, RDPAL_FADE);
@@ -418,7 +413,6 @@
 	WaitForFade();
 
 	EraseBackBuffer();
-	CopyScreenBuffer();
 
 	// FadeUp((float) 0.75);	
 	// removed by JEL (08oct97) to prevent "eye" smacker corruption when

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- resman.cpp	27 Sep 2003 11:02:57 -0000	1.44
+++ resman.cpp	27 Sep 2003 15:44:26 -0000	1.45
@@ -1218,7 +1218,6 @@
 	textSprite.x = textX;
 	textSprite.y = textY;
 
-	CopyScreenBuffer();
 	FadeUp((float) 0.75);
 
 	WaitForFade();
@@ -1259,7 +1258,6 @@
 			textSprite.x = textX;
 			textSprite.y = textY;
 
-			CopyScreenBuffer();
 			fr++;
 		} else
 			step++;
@@ -1279,7 +1277,6 @@
 
 	FadeDown((float) 0.75);
 	WaitForFade();
-	CopyScreenBuffer();
 	FadeUp((float) 0.75);
 
 	// Git rid of read-only status.
@@ -1436,18 +1433,12 @@
 			}
 		}
 		
-		//--------------------------------------------------
-		// Service windows
-
 		ServiceWindows();
 
-		//--------------------------------------------------
-	
 		EraseBackBuffer();
 		DrawSprite(&spriteInfo);	// Keep the message there even when the user task swaps.
 		spriteInfo.y = oldY;		// Drivers change the y co-ordinate, don't know why...
 		spriteInfo.x = oldX;
-		CopyScreenBuffer();
 	} while (!done);
 
 	Free_mem(text_spr);





More information about the Scummvm-git-logs mailing list