moved drawBox to gfx.cpp (seems to be the more logical location)

svn-id: r7554

2 files changed, 65 insertions, 62 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 2ef7509dd3..4281dfe411 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -522,6 +522,67 @@ void Scumm::blit(byte *dst, byte *src, int w, int h) {
 	} while (--h);
 }
 
+void Scumm::drawBox(int x, int y, int x2, int y2, int color) {
+	int width, height;
+	VirtScreen *vs;
+	byte *backbuff, *bgbuff;
+
+	if ((vs = findVirtScreen(y)) == NULL)
+		return;
+
+	if (x > x2)
+		SWAP(x, x2);
+
+	if (y > y2)
+		SWAP(y, y2);
+
+	x2++;
+	y2++;
+
+	// Adjust for the topline of the VirtScreen
+	y -= vs->topline;
+	y2 -= vs->topline;
+	
+	// Clip the coordinates
+	if (x < 0)
+		x = 0;
+	else if (x >= vs->width)
+		return;
+
+	if (x2 < 0)
+		return;
+	else if (x2 > vs->width)
+		x2 = vs->width;
+
+	if (y < 0)
+		y = 0;
+	else if (y > vs->height)
+		return;
+
+	if (y2 < 0)
+		return;
+	else if (y2 > vs->height)
+		y2 = vs->height;
+	
+	updateDirtyRect(vs->number, x, x2, y, y2, 0);
+
+	backbuff = vs->screenPtr + vs->xstart + y * _screenWidth + x;
+
+	width = x2 - x;
+	height = y2 - y;
+	if (color == -1) {
+		if (vs->number != 0)
+			error("can only copy bg to main window");
+		bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + y * _screenWidth + x;
+		blit(backbuff, bgbuff, width, height);
+	} else {
+		while (height--) {
+			memset(backbuff, color, width);
+			backbuff += _screenWidth;
+		}
+	}
+}
+
 #pragma mark -
 
 void Scumm::initBGBuffers(int height) {
@@ -854,6 +915,10 @@ bool Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) {
 	return false;
 }
 
+#pragma mark -
+#pragma mark --- Image drawing ---
+#pragma mark -
+
 void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height,
                      int stripnr, int numstrip, byte flag) {
 	assert(ptr);
diff --git a/scumm/script.cpp b/scumm/script.cpp
index cf909f30bd..9db679df70 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -497,68 +497,6 @@ int Scumm::pop() {
 	return _scummStack[--_scummStackPos];
 }
 
-void Scumm::drawBox(int x, int y, int x2, int y2, int color) {
-	int width, height;
-	VirtScreen *vs;
-	byte *backbuff, *bgbuff;
-
-	if ((vs = findVirtScreen(y)) == NULL)
-		return;
-
-	if (x > x2)
-		SWAP(x, x2);
-
-	if (y > y2)
-		SWAP(y, y2);
-
-	x2++;
-	y2++;
-
-	// Adjust for the topline of the VirtScreen
-	y -= vs->topline;
-	y2 -= vs->topline;
-	
-	// Clip the coordinates
-	if (x < 0)
-		x = 0;
-	else if (x >= vs->width)
-		return;
-
-	if (x2 < 0)
-		return;
-	else if (x2 > vs->width)
-		x2 = vs->width;
-
-	if (y < 0)
-		y = 0;
-	else if (y > vs->height)
-		return;
-
-	if (y2 < 0)
-		return;
-	else if (y2 > vs->height)
-		y2 = vs->height;
-	
-	updateDirtyRect(vs->number, x, x2, y, y2, 0);
-
-	backbuff = vs->screenPtr + vs->xstart + y * _screenWidth + x;
-
-	width = x2 - x;
-	height = y2 - y;
-	if (color == -1) {
-		if (vs->number != 0)
-			error("can only copy bg to main window");
-		bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + y * _screenWidth + x;
-		blit(backbuff, bgbuff, width, height);
-	} else {
-		while (height--) {
-			memset(backbuff, color, width);
-			backbuff += _screenWidth;
-		}
-	}
-}
-
-
 void Scumm::stopObjectCode() {
 	ScriptSlot *ss;