[Scummvm-cvs-logs] CVS: scummvm/gui newgui.h,1.41,1.42 newgui.cpp,1.82,1.83

[Max Horn]

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

Modified Files:
	newgui.h newgui.cpp 
Log Message:
cleanup

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- newgui.h	21 Mar 2004 21:20:17 -0000	1.41
+++ newgui.h	22 Mar 2004 22:01:10 -0000	1.42
@@ -35,9 +35,6 @@
 
 class Dialog;
 
-#define hLine(x, y, x2, color) line(x, y, x2, y, color);
-#define vLine(x, y, y2, color) line(x, y, x, y2, color);
-
 #define g_gui	(GUI::NewGui::instance())
 
 
@@ -140,7 +137,8 @@
 	// Drawing primitives
 	OverlayColor *getBasePtr(int x, int y);
 	void box(int x, int y, int width, int height, OverlayColor colorA, OverlayColor colorB);
-	void line(int x, int y, int x2, int y2, OverlayColor color);
+	void hLine(int x, int y, int x2, OverlayColor color);
+	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);

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- newgui.cpp	15 Mar 2004 18:44:14 -0000	1.82
+++ newgui.cpp	22 Mar 2004 22:01:10 -0000	1.83
@@ -255,28 +255,30 @@
 	vLine(x + width - 2, y + 1, y + height - 1, colorB);
 }
 
-void NewGui::line(int x, int y, int x2, int y2, OverlayColor color) {
+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;
+	}
+}
+
+void NewGui::vLine(int x, int y, int y2, OverlayColor color) {
+	OverlayColor *ptr;
+
 	if (y2 < y)
 		SWAP(y2, y);
 
 	ptr = getBasePtr(x, y);
 
-	if (x == x2) {
-		/* vertical line */
-		while (y++ <= y2) {
-			*ptr = color;
-			ptr += _screenPitch;
-		}
-	} else if (y == y2) {
-		/* horizontal line */
-		while (x++ <= x2) {
-			*ptr++ = color;
-		}
+	while (y++ <= y2) {
+		*ptr = color;
+		ptr += _screenPitch;
 	}
 }