[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.32,1.33 driver96.h,1.48,1.49 menu.cpp,1.14,1.15 render.cpp,1.31,1.32 render.h,1.6,1.7 sprite.cpp,1.25,1.26

Max Horn fingolfin at users.sourceforge.net
Thu Oct 2 10:44:01 CEST 2003


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

Modified Files:
	d_draw.cpp driver96.h menu.cpp render.cpp render.h sprite.cpp 
Log Message:
renamed namespace ScummVM to Common

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- d_draw.cpp	2 Oct 2003 07:01:12 -0000	1.32
+++ d_draw.cpp	2 Oct 2003 17:43:01 -0000	1.33
@@ -305,7 +305,7 @@
 		SetNeedRedraw();
 
 		// HACK: Remove the instructions created above
-		ScummVM::Rect r;
+		Common::Rect r;
 
 		memset(lpBackBuffer, 0, screenWide * MENUDEEP);
 		r.left = r.top = 0;

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- driver96.h	29 Sep 2003 13:46:48 -0000	1.48
+++ driver96.h	2 Oct 2003 17:43:01 -0000	1.49
@@ -377,7 +377,7 @@
 //-----------------------------------------------------------------------------
 extern int32 DrawSprite(_spriteInfo *s);
 extern int32 CreateSurface(_spriteInfo *s, uint8 **surface);
-extern void DrawSurface(_spriteInfo *s, uint8 *surface, ScummVM::Rect *clipRect = NULL);
+extern void DrawSurface(_spriteInfo *s, uint8 *surface, Common::Rect *clipRect = NULL);
 extern void DeleteSurface(uint8 *surface);
 extern int32 OpenLightMask(_spriteInfo *s);
 extern int32 CloseLightMask(void);

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- menu.cpp	28 Sep 2003 14:13:57 -0000	1.14
+++ menu.cpp	2 Oct 2003 17:43:01 -0000	1.15
@@ -43,7 +43,7 @@
 
 static uint8 iconCount = 0;
 
-void ClearIconArea(int menu, int pocket, ScummVM::Rect *r) {
+void ClearIconArea(int menu, int pocket, Common::Rect *r) {
 	byte *dst;
 	int i;
 
@@ -74,7 +74,7 @@
 	uint8 frameCount;
 	int32 curx, xoff;
 	int32 cury, yoff;
-	ScummVM::Rect r1, r2;
+	Common::Rect r1, r2;
 	int32 delta;
 	static int32 lastTime = 0;
 
@@ -254,7 +254,7 @@
  */
 
 int32 CloseMenuImmediately(void) {
-	ScummVM::Rect r;
+	Common::Rect r;
 	int i;
 
 	menuStatus[0] = RDMENU_HIDDEN;
@@ -284,7 +284,7 @@
  */
 
 int32 SetMenuIcon(uint8 menu, uint8 pocket, uint8 *icon) {
-	ScummVM::Rect r;
+	Common::Rect r;
 
 	debug(5, "stub SetMenuIcon( %d, %d )", menu, pocket);
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- render.cpp	29 Sep 2003 13:46:48 -0000	1.31
+++ render.cpp	2 Oct 2003 17:43:01 -0000	1.32
@@ -74,12 +74,12 @@
 
 BlockSurface **blockSurfaces[MAXLAYERS] = { 0, 0, 0, 0, 0 };
 
-void UploadRect(ScummVM::Rect *r) {
+void UploadRect(Common::Rect *r) {
 	g_system->copy_rect(lpBackBuffer + r->top * screenWide + r->left,
 		screenWide, r->left, r->top, r->right - r->left, r->bottom - r->top);
 }
 
-void BlitBlockSurface(BlockSurface *s, ScummVM::Rect *r, ScummVM::Rect *clip_rect) {
+void BlitBlockSurface(BlockSurface *s, Common::Rect *r, Common::Rect *clip_rect) {
 	if (r->top > clip_rect->bottom || r->left > clip_rect->right || r->bottom <= clip_rect->top || r->right <= clip_rect->left)
 		return;
 
@@ -703,7 +703,7 @@
 
 int32 RenderParallax(_parallax *p, int16 l) {
 	int16 x, y;
-	ScummVM::Rect r;
+	Common::Rect r;
 
 	if (locationWide == screenWide)
 		x = 0;
@@ -715,7 +715,7 @@
 	else
 		y = ((int32) ((p->h - (screenDeep - MENUDEEP * 2)) * scrolly) / (int32) (locationDeep - (screenDeep - MENUDEEP * 2)));
 
-	ScummVM::Rect clip_rect;
+	Common::Rect clip_rect;
 
 	// Leave enough space for the top and bottom menues
 

Index: render.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- render.h	27 Sep 2003 15:38:42 -0000	1.6
+++ render.h	2 Oct 2003 17:43:01 -0000	1.7
@@ -56,6 +56,6 @@
 void SquashImage(byte *dst, uint16 dstPitch, uint16 dstWidth, uint16 dstHeight, byte *src, uint16 srcPitch, uint16 srcWidth, uint16 srcHeight, byte *backbuf);
 void StretchImage(byte *dst, uint16 dstPitch, uint16 dstWidth, uint16 dstHeight, byte *src, uint16 srcPitch, uint16 srcWidth, uint16 srcHeight, byte *backbuf);
 
-void UploadRect(ScummVM::Rect *r);
+void UploadRect(Common::Rect *r);
 
 #endif

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/sprite.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sprite.cpp	2 Oct 2003 07:01:12 -0000	1.25
+++ sprite.cpp	2 Oct 2003 17:43:01 -0000	1.26
@@ -295,8 +295,8 @@
  * @param clipRect the clipping rectangle
  */
 
-void DrawSurface(_spriteInfo *s, uint8 *surface, ScummVM::Rect *clipRect) {
-	ScummVM::Rect rd, rs;
+void DrawSurface(_spriteInfo *s, uint8 *surface, Common::Rect *clipRect) {
+	Common::Rect rd, rs;
 	uint16 x, y, srcPitch;
 	uint8 *src, *dst;
 
@@ -398,7 +398,7 @@
 	uint16 srcPitch;
 	bool freeSprite = false;
 	bool clipped = false;
-	ScummVM::Rect rd, rs;
+	Common::Rect rd, rs;
 
 	// -----------------------------------------------------------------
 	// Decompression and mirroring





More information about the Scummvm-git-logs mailing list