MORTEVIELLE: Removed unused clear_box() and fill_box(), and renamed fillBox to fillRect

12 files changed, 19 insertions, 113 deletions

diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp
index 8f2ff4ffd3..6eb7d5e912 100644
--- a/engines/mortevielle/alert.cpp
+++ b/engines/mortevielle/alert.cpp
@@ -30,7 +30,6 @@
 #include "mortevielle/level15.h"
 #include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
-#include "mortevielle/sprint.h"
 
 namespace Mortevielle {
 
@@ -100,9 +99,9 @@ static void fait_boite(int lidep, int nli, int tx) {
 	y = pred(int, lidep) << 3;
 	xx = x + tx;
 	yy = y + (nli << 3);
-	g_vm->_screenSurface.fillBox(15, Common::Rect(x, y, xx, yy));
-	g_vm->_screenSurface.fillBox(0, Common::Rect(x, y + 2, xx, y + 4));
-	g_vm->_screenSurface.fillBox(0, Common::Rect(x, yy - 4, xx, yy - 2));
+	g_vm->_screenSurface.fillRect(15, Common::Rect(x, y, xx, yy));
+	g_vm->_screenSurface.fillRect(0, Common::Rect(x, y + 2, xx, y + 4));
+	g_vm->_screenSurface.fillRect(0, Common::Rect(x, yy - 4, xx, yy - 2));
 }
 
 
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 3ac08cfea1..bdf6c86daa 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -1006,7 +1006,7 @@ void ScreenSurface::drawBox(int x, int y, int dx, int dy, int col) {
  * @remarks		Because the ScummVM surface is using a double height 640x400 surface to 
  *		simulate the original 640x400 surface, all Y values have to be doubled
  */
-void ScreenSurface::fillBox(int colour, const Common::Rect &bounds) {
+void ScreenSurface::fillRect(int colour, const Common::Rect &bounds) {
 	Graphics::Surface destSurface = lockArea(Common::Rect(bounds.left, bounds.top * 2,
 		bounds.right, bounds.bottom * 2));
 	
@@ -1061,7 +1061,7 @@ void ScreenSurface::writeg(const Common::String &l, int c) {
 	case 1:
 	case 3  : {
 		cecr = 0;
-		g_vm->_screenSurface.fillBox(15, Common::Rect(pt.x, pt.y, x, pt.y + 7));
+		g_vm->_screenSurface.fillRect(15, Common::Rect(pt.x, pt.y, x, pt.y + 7));
 	}
 	break;
 	case 4 : {
@@ -1075,7 +1075,7 @@ void ScreenSurface::writeg(const Common::String &l, int c) {
 	case 0:
 	case 2 : {
 		cecr = 15;
-		g_vm->_screenSurface.fillBox(0, Common::Rect(pt.x, pt.y, x, pt.y + 7));
+		g_vm->_screenSurface.fillRect(0, Common::Rect(pt.x, pt.y, x, pt.y + 7));
 	}
 	break;
 	}
diff --git a/engines/mortevielle/graphics.h b/engines/mortevielle/graphics.h
index 38f2ac3068..1daad5720b 100644
--- a/engines/mortevielle/graphics.h
+++ b/engines/mortevielle/graphics.h
@@ -87,7 +87,7 @@ public:
 	void copyFrom(Graphics::Surface &src, int x, int y);
 	void writeCharacter(const Common::Point &pt, unsigned char ch, int palIndex);
 	void drawBox(int x, int y, int dx, int dy, int col);
-	void fillBox(int colour, const Common::Rect &bounds);
+	void fillRect(int colour, const Common::Rect &bounds);
 	void clearScreen();
 	void putxy(int x, int y) { _textPos = Common::Point(x, y); }
 	void writeg(const Common::String &l, int c);
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 71b0ccf407..12ccbe3ff5 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -32,7 +32,6 @@
 #include "mortevielle/menu.h"
 #include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
-#include "mortevielle/sprint.h"
 #include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
@@ -146,7 +145,7 @@ void menu_aff() {
 	     clrscr;
 	     halt;
 	   end;*/
-	g_vm->_screenSurface.fillBox(7, Common::Rect(0, 0, 639, 10));
+	g_vm->_screenSurface.fillRect(7, Common::Rect(0, 0, 639, 10));
 	col = 28 * res;
 	if (gd == cga)  color = 1;
 	else color = 9;
@@ -278,9 +277,9 @@ void menu_down(int ii) {
 	if (res == 1)  cx = 10;
 	else cx = 6;
 	xcc = xco + (don[ii][3] * cx) + 6;
-	g_vm->_screenSurface.fillBox(15, Common::Rect(xco, 12, xcc, 10 + (don[ii][2] << 1)));
-	g_vm->_screenSurface.fillBox(0, Common::Rect(xcc, 12, xcc + 4, 10 + (don[ii][2] << 1)));
-	g_vm->_screenSurface.fillBox(0, Common::Rect(xco, 8 + (don[ii][2] << 1), xcc + 4, 12 + (don[ii][2] << 1)));
+	g_vm->_screenSurface.fillRect(15, Common::Rect(xco, 12, xcc, 10 + (don[ii][2] << 1)));
+	g_vm->_screenSurface.fillRect(0, Common::Rect(xcc, 12, xcc + 4, 10 + (don[ii][2] << 1)));
+	g_vm->_screenSurface.fillRect(0, Common::Rect(xco, 8 + (don[ii][2] << 1), xcc + 4, 12 + (don[ii][2] << 1)));
 	g_vm->_screenSurface.putxy(xco, 16);
 	cx = 0;
 	do {
diff --git a/engines/mortevielle/module.mk b/engines/mortevielle/module.mk
index 4d2072a913..0688fd5ac0 100644
--- a/engines/mortevielle/module.mk
+++ b/engines/mortevielle/module.mk
@@ -22,7 +22,6 @@ MODULE_OBJS := \
 	ques.o \
 	saveload.o \
 	sound.o \
-	sprint.o \
 	taffich.o \
 	var_mor.o
 
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index ea9012e49e..2f48999638 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -38,7 +38,6 @@
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/parole2.h"
-#include "mortevielle/sprint.h"
 #include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
@@ -149,7 +148,7 @@ void clsf1() {
 
 	/* debug('clsf1'); */
 	hide_mouse();
-	g_vm->_screenSurface.fillBox(0, Common::Rect(0, 11, 514, 175));
+	g_vm->_screenSurface.fillRect(0, Common::Rect(0, 11, 514, 175));
 	/* if Gd=ams then port[$3DD]:=15;
 	 case Gd of
 	         ams,
@@ -198,11 +197,11 @@ void clsf2() {
 	/* debug('clsf2'); */
 	hide_mouse();
 	if (f2_all) {
-		g_vm->_screenSurface.fillBox(0, Common::Rect(1, 176, 633, 199));
+		g_vm->_screenSurface.fillRect(0, Common::Rect(1, 176, 633, 199));
 		g_vm->_screenSurface.drawBox(0, 175, 634, 24, 15);
 		f2_all = false;
 	} else {
-		g_vm->_screenSurface.fillBox(0, Common::Rect(1, 176, 633, 190));
+		g_vm->_screenSurface.fillRect(0, Common::Rect(1, 176, 633, 190));
 		g_vm->_screenSurface.drawBox(0, 175, 634, 15, 15);
 	}
 	show_mouse();
@@ -247,7 +246,7 @@ void clsf3() {
 
 	/* debug('clsf3'); */
 	hide_mouse();
-	g_vm->_screenSurface.fillBox(0, Common::Rect(1, 192, 633, 199));
+	g_vm->_screenSurface.fillRect(0, Common::Rect(1, 192, 633, 199));
 	g_vm->_screenSurface.drawBox(0, 191, 634, 8, 15);
 	show_mouse();
 }
@@ -285,7 +284,7 @@ void clsf10() {
 		co = 600;
 		cod = 544;
 	}
-	g_vm->_screenSurface.fillBox(15, Common::Rect(cod, 93, co, 98));
+	g_vm->_screenSurface.fillRect(15, Common::Rect(cod, 93, co, 98));
 	if (s.conf < 33)
 		st = g_vm->getString(S_COOL);
 	else if (s.conf < 66)
@@ -300,7 +299,7 @@ void clsf10() {
 	g_vm->_screenSurface.writeg(st, 4);
 	if (res == 1)  co = 620;
 	else co = 584;
-	g_vm->_screenSurface.fillBox(15, Common::Rect(560, 24, co, 86));
+	g_vm->_screenSurface.fillRect(15, Common::Rect(560, 24, co, 86));
 	/* rempli(69,12,32,5,255);*/
 	show_mouse();
 }
@@ -319,7 +318,7 @@ void paint_rect(int x, int y, int dx, int dy) {
 	/* debug('paint_rect'); */
 	if (gd == cga)  co = 3;
 	else co = 11;
-	g_vm->_screenSurface.fillBox(co, Common::Rect(x, y, x + dx, y + dy));
+	g_vm->_screenSurface.fillRect(co, Common::Rect(x, y, x + dx, y + dy));
 }
 
 int hazard(int min, int max) {
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index e7d75517be..4f2cadef74 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -29,7 +29,6 @@
 #include "mortevielle/graphics.h"
 #include "mortevielle/level15.h"
 #include "mortevielle/mortevielle.h"
-#include "mortevielle/sprint.h"
 #include "mortevielle/var_mor.h"
 #include "common/str.h"
 
diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp
index 7deda53d7b..df79b72a6b 100644
--- a/engines/mortevielle/ovd1.cpp
+++ b/engines/mortevielle/ovd1.cpp
@@ -37,7 +37,6 @@
 #include "mortevielle/ovd1.h"
 #include "mortevielle/parole.h"
 #include "mortevielle/sound.h"
-#include "mortevielle/sprint.h"
 #include "mortevielle/taffich.h"
 #include "mortevielle/var_mor.h"
 
diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp
index 5453500fcd..17921951cf 100644
--- a/engines/mortevielle/ques.cpp
+++ b/engines/mortevielle/ques.cpp
@@ -31,7 +31,6 @@
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/ques.h"
-#include "mortevielle/sprint.h"
 
 namespace Mortevielle {
 
@@ -63,7 +62,7 @@ namespace Mortevielle {
 		deline(ta[i], st, tay);
 		if (res == 1)  y = 29;
 		else y = 23;
-		g_vm->_screenSurface.fillBox(15, Common::Rect(0, 14, 630, y));
+		g_vm->_screenSurface.fillRect(15, Common::Rect(0, 14, 630, y));
 		afftex(st, 20, 15, 100, 2, 0);
 		if (i != 10) {
 			prem = ta[i] + 1;
diff --git a/engines/mortevielle/sprint.cpp b/engines/mortevielle/sprint.cpp
deleted file mode 100644
index e6d00358d5..0000000000
--- a/engines/mortevielle/sprint.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This code is based on original Mortville Manor DOS source code
- * Copyright (c) 1988-1989 Lankhor
- */
-
-#include "common/str.h"
-#include "common/textconsole.h"
-#include "mortevielle/mortevielle.h"
-#include "mortevielle/mouse.h"
-#include "mortevielle/sprint.h"
-#include "mortevielle/var_mor.h"
-
-namespace Mortevielle {
-
-void fill_box(int x, int y, int dx) {
-	g_vm->_screenSurface.fillBox(15, Common::Rect(pred(int, x) << 3, pred(int, y) << 3, 
-		pred(int, x + dx) << 3, y << 3));
-}
-
-void clear_box(int x, int y, int dx) {
-	g_vm->_screenSurface.fillBox(0, Common::Rect(pred(int, x) << 3, pred(int, y) << 3, 
-		pred(int, x + dx) << 3, y << 3));
-}
-
-} // End of namespace Mortevielle
diff --git a/engines/mortevielle/sprint.h b/engines/mortevielle/sprint.h
deleted file mode 100644
index 09d5758f63..0000000000
--- a/engines/mortevielle/sprint.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This code is based on original Mortville Manor DOS source code
- * Copyright (c) 1988-1989 Lankhor
- */
-
-#ifndef MORTEVIELLE_SPRINT_H
-#define MORTEVIELLE_SPRINT_H
-
-#include "common/str.h"
-
-namespace Mortevielle {
-
-extern void fill_box(int x, int y, int dx);
-extern void clear_box(int x, int y, int dx);
-
-} // End of namespace Mortevielle
-#endif
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index 1fc18e70d0..7b6156263c 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -29,7 +29,6 @@
 #include "common/str.h"
 #include "common/textconsole.h"
 #include "mortevielle/mortevielle.h"
-#include "mortevielle/sprint.h"
 #include "mortevielle/var_mor.h"
 
 namespace Mortevielle {