From 7b158941e75914b915b5d9fdbcb0676e0aa71873 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 22 Mar 2004 22:01:10 +0000
Subject: cleanup

svn-id: r13364
---
 gui/newgui.cpp | 26 ++++++++++++++------------
 gui/newgui.h   |  6 ++----
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'gui')

diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index a167fd9382..af59489e56 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -255,28 +255,30 @@ void NewGui::box(int x, int y, int width, int height, OverlayColor colorA, Overl
 	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;
 	}
 }
 
diff --git a/gui/newgui.h b/gui/newgui.h
index 19be0bbfb1..843f84eac1 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -35,9 +35,6 @@ namespace GUI {
 
 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 @@ public:
 	// 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);
-- 
cgit v1.2.3