From b8419baa67f26c807fdfb1fa5c5d3d3e2d3ff406 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 4 Oct 2004 14:39:42 +0000
Subject: Remove Gdi::fillRect, use the existing fill() method instead

svn-id: r15412
---
 scumm/gfx.cpp | 17 ++---------------
 scumm/gfx.h   |  1 -
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index dd22ae2bfd..135459c0c5 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -39,6 +39,7 @@ static void fill(byte *dst, int dstPitch, byte color, int w, int h);
 static void copy8Col(byte *dst, int dstPitch, const byte *src, int height);
 static void clear8Col(byte *dst, int dstPitch, int height);
 
+
 struct StripTable {
 	int offsets[160];
 	int run[160];
@@ -1394,7 +1395,7 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs, int startstrip) {
 	// for an area spanning multiple strips. In particular, the codecs 13 & 14
 	// in decompressBitmap call drawStripHE()
 	if (code == 150) {
-		fillRect((byte *)vs->backBuf, vs->pitch, 0, 0, vs->w - 1, vs->h - 1, *bmap_ptr);
+		fill((byte *)vs->backBuf, vs->pitch, *bmap_ptr, vs->w, vs->h);
 	} else if ((code >= 134 && code <= 138) || (code >= 144 && code <= 148)) {
 		_decomp_shr = code % 10;
 		_decomp_mask = 0xFF >> (8 - _decomp_shr);
@@ -2169,20 +2170,6 @@ void Gdi::drawStripHE(byte *dst, int dstPitch, const byte *src, int width, int h
 	}
 }
 
-void Gdi::fillRect(byte *dst, int pitch, int x1, int y1, int x2, int y2, byte color) {
-	int w, h;
-	byte *ptr = dst + x1 + y1 * pitch;
-
-	w = x2 - x1 + 1;
-	h = y2 - y1 + 1;
-
-	for (int i = 0; i < h; i++) {
-		memset(ptr, color, w);
-		ptr += pitch;
-	}
-}
-
-
 #undef READ_BIT
 #undef FILL_BITS
 
diff --git a/scumm/gfx.h b/scumm/gfx.h
index d2aae0dacb..bf04918938 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -249,7 +249,6 @@ protected:
 	void drawStrip3DO(byte *dst, int dstPitch, const byte *src, int height, const bool transpCheck) const;
 
 	void drawStripHE(byte *dst, int dstPitch, const byte *src, int width, int height, const bool transpCheck) const;
-	void fillRect(byte *dst, int dstPitch, int x1, int y1, int x2, int y2, byte color);
 
 	/* Mask decompressors */
 	void drawStripC64Mask(byte *dst, int stripnr, int width, int height) const;
-- 
cgit v1.2.3