[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.88,1.89 newgui.h,1.46,1.47

[Max Horn]

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

Modified Files:
	newgui.cpp newgui.h 
Log Message:
Make use of the new graphic primitives

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- newgui.cpp	17 Oct 2004 19:40:34 -0000	1.88
+++ newgui.cpp	25 Nov 2004 23:34:50 -0000	1.89
@@ -252,7 +252,7 @@
 }
 
 OverlayColor *NewGui::getBasePtr(int x, int y) {
-	return (OverlayColor *)((byte *)_screen.pixels + x * _screen.bytesPerPixel + y * _screen.pitch);
+	return (OverlayColor *)_screen.getBasePtr(x, y);
 }
 
 void NewGui::box(int x, int y, int width, int height, OverlayColor colorA, OverlayColor colorB) {
@@ -268,30 +268,11 @@
 }
 
 void NewGui::hLine(int x, int y, int x2, OverlayColor color) {
-	OverlayColor *ptr;
-
-	if (x2 < x)
-		SWAP(x2, x);
-
-	ptr = getBasePtr(x, y);
-
-	while (x++ <= x2) {
-		*ptr++ = color;
-	}
+	_screen.hLine(x, y, x2, color);
 }
 
 void NewGui::vLine(int x, int y, int y2, OverlayColor color) {
-	OverlayColor *ptr;
-
-	if (y2 < y)
-		SWAP(y2, y);
-
-	ptr = getBasePtr(x, y);
-
-	while (y++ <= y2) {
-		*ptr = color;
-		ptr += _screenPitch;
-	}
+	_screen.vLine(x, y, y2, color);
 }
 
 void NewGui::blendRect(int x, int y, int w, int h, OverlayColor color, int level) {
@@ -320,48 +301,11 @@
 }
 
 void NewGui::fillRect(int x, int y, int w, int h, OverlayColor color) {
-	int i;
-	OverlayColor *ptr = getBasePtr(x, y);
-
-	while (h--) {
-		for (i = 0; i < w; i++) {
-			ptr[i] = color;
-		}
-		ptr += _screenPitch;
-	}
-}
-
-void NewGui::checkerRect(int x, int y, int w, int h, OverlayColor color) {
-	int i;
-	OverlayColor *ptr = getBasePtr(x, y);
-
-	while (h--) {
-		for (i = 0; i < w; i++) {
-			if ((h ^ i) & 1)
-				ptr[i] = color;
-		}
-		ptr += _screenPitch;
-	}
+	_screen.fillRect(Common::Rect(x, y, x+w, y+h), color);
 }
 
 void NewGui::frameRect(int x, int y, int w, int h, OverlayColor color) {
-	int i;
-	OverlayColor *ptr, *basePtr = getBasePtr(x, y);
-	if (basePtr == NULL)
-		return;
-
-	ptr = basePtr;
-	for (i = 0; i < w; i++, ptr++)
-		*ptr = color;
-	ptr--;
-	for (i = 0; i < h; i++, ptr += _screenPitch)
-		*ptr = color;
-	ptr = basePtr;
-	for (i = 0; i < h; i++, ptr += _screenPitch)
-		*ptr = color;
-	ptr -= _screenPitch;
-	for (i = 0; i < w; i++, ptr++)
-		*ptr = color;
+	_screen.frameRect(Common::Rect(x, y, x+w, y+h), color);
 }
 
 void NewGui::addDirtyRect(int x, int y, int w, int h) {

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- newgui.h	15 Aug 2004 13:49:13 -0000	1.46
+++ newgui.h	25 Nov 2004 23:35:02 -0000	1.47
@@ -126,7 +126,6 @@
 	void vLine(int x, int y, int y2, OverlayColor color);
 	void blendRect(int x, int y, int w, int h, OverlayColor color, int level = 3);
 	void fillRect(int x, int y, int w, int h, OverlayColor color);
-	void checkerRect(int x, int y, int w, int h, OverlayColor color);
 	void frameRect(int x, int y, int w, int h, OverlayColor color);
 
 	void drawChar(byte c, int x, int y, OverlayColor color, const Graphics::Font *font = 0);