aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mortevielle/boite.cpp41
-rw-r--r--engines/mortevielle/boite.h37
-rw-r--r--engines/mortevielle/module.mk1
-rw-r--r--engines/mortevielle/mor.cpp20
-rw-r--r--engines/mortevielle/mor2.cpp11
-rw-r--r--engines/mortevielle/ques.cpp3
6 files changed, 16 insertions, 97 deletions
diff --git a/engines/mortevielle/boite.cpp b/engines/mortevielle/boite.cpp
deleted file mode 100644
index 7072085c23..0000000000
--- a/engines/mortevielle/boite.cpp
+++ /dev/null
@@ -1,41 +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/textconsole.h"
-#include "mortevielle/boite.h"
-#include "mortevielle/mortevielle.h"
-
-namespace Mortevielle {
-
-//Translation: box()
-void boite(int x, int y, int dx, int dy, int coul) {
- debugC(1, kMortevielleCore, "TODO: boite is deprecated in favour of ScreenSurface::drawBox");
-
- g_vm->_screenSurface.drawBox(x, y, dx, dy, coul);
-}
-
-} // End of namespace Mortevielle
diff --git a/engines/mortevielle/boite.h b/engines/mortevielle/boite.h
deleted file mode 100644
index bff3e82d55..0000000000
--- a/engines/mortevielle/boite.h
+++ /dev/null
@@ -1,37 +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_BOITE_H
-#define MORTEVIELLE_BOITE_H
-
-namespace Mortevielle {
-
-extern void boite(int x, int y, int dx, int dy, int coul);
-
-
-} // End of namespace Mortevielle
-#endif
diff --git a/engines/mortevielle/module.mk b/engines/mortevielle/module.mk
index 28c6c7fc6d..4d2072a913 100644
--- a/engines/mortevielle/module.mk
+++ b/engines/mortevielle/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS := \
actions.o \
alert.o \
asm.o \
- boite.o \
detection.o \
droite.o \
graphics.o \
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index 89787312d0..6e2d1057cb 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -30,7 +30,6 @@
#include "common/system.h"
#include "common/textconsole.h"
#include "mortevielle/alert.h"
-#include "mortevielle/boite.h"
#include "mortevielle/droite.h"
#include "mortevielle/level15.h"
#include "mortevielle/menu.h"
@@ -141,7 +140,8 @@ void initouv() {
}
void ecrf1() {
- boite(0, 11, 512, 163, 15); /* grand dessin */ //Translation: Large drawing
+ // Large drawing
+ g_vm->_screenSurface.drawBox(0, 11, 512, 163, 15);
}
void clsf1() {
@@ -199,11 +199,11 @@ void clsf2() {
hide_mouse();
if (f2_all) {
box(0, gd, 1, 176, 633, 199, 255);
- boite(0, 175, 634, 24, 15);
+ g_vm->_screenSurface.drawBox(0, 175, 634, 24, 15);
f2_all = false;
} else {
box(0, gd, 1, 176, 633, 190, 255);
- boite(0, 175, 634, 15, 15);
+ g_vm->_screenSurface.drawBox(0, 175, 634, 15, 15);
}
show_mouse();
}
@@ -211,7 +211,7 @@ void clsf2() {
void ecrf2() {
/* debug('ecrf2'); */
text_color(5);
- /*boite(0,175,630,15,15);*/
+ /*g_vm->_screenSurface.drawBox(0,175,630,15,15);*/
}
void ecr2(Common::String str_) {
@@ -248,7 +248,7 @@ void clsf3() {
/* debug('clsf3'); */
hide_mouse();
box(0, gd, 1, 192, 633, 199, 255);
- boite(0, 191, 634, 8, 15);
+ g_vm->_screenSurface.drawBox(0, 191, 634, 8, 15);
show_mouse();
}
@@ -262,7 +262,7 @@ void ecr3(Common::String text) {
void ecrf6() {
/* debug('ecrf6'); */
text_color(5);
- boite(62, 33, 363, 80, 15);
+ g_vm->_screenSurface.drawBox(62, 33, 363, 80, 15);
}
void ecrf7() {
@@ -459,7 +459,7 @@ void f3f8() {
g_vm->_screenSurface.writeg(g_vm->getString(S_F3), 5);
g_vm->_screenSurface._textPos.y = 51;
g_vm->_screenSurface.writeg(g_vm->getString(S_F8), 5);
- boite(0, 42, co, 16, 7);
+ g_vm->_screenSurface.drawBox(0, 42, co, 16, 7);
}
void t5(int cx) {
@@ -1321,10 +1321,10 @@ void dessin(int ad) {
clsf1();
if (caff > 99) {
dessine(ades, 60, 33);
- boite(118, 32, 291, 121, 15); /* cadre moyen */ //Translation: Medium box
+ g_vm->_screenSurface.drawBox(118, 32, 291, 121, 15); /* cadre moyen */ //Translation: Medium box
} else if (caff > 69) {
dessine(ades, 112, 48); /* tˆtes */ //Translation: Heads
- boite(222, 47, 155, 91, 15);
+ g_vm->_screenSurface.drawBox(222, 47, 155, 91, 15);
} else {
dessine(ades, 0, 12);
ecrf1();
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 515fd836f6..496ce64f92 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -27,7 +27,6 @@
#include "mortevielle/mor2.h"
#include "mortevielle/alert.h"
-#include "mortevielle/boite.h"
#include "mortevielle/keyboard.h"
#include "mortevielle/menu.h"
#include "mortevielle/mor.h"
@@ -190,7 +189,7 @@ void fenat(char ans) {
coul = 12;
g_vm->_screenSurface.writeCharacter(Common::Point(306, 193), ord(ans), coul);
- boite(300, 191, 16, 8, 15);
+ g_vm->_screenSurface.drawBox(300, 191, 16, 8, 15);
show_mouse();
}
@@ -308,7 +307,7 @@ void tperd() {
t11(21, cx);
g_vm->_loseGame = true;
clsf1();
- boite(60, 35, 400, 50, 15);
+ g_vm->_screenSurface.drawBox(60, 35, 400, 50, 15);
repon(9, crep);
clsf2();
clsf3();
@@ -402,7 +401,7 @@ void sparl(float adr, float rep) {
deline(repint + c_paroles, st, tay);
afftex(st, 230, 4, 65, 24, 5);
f3f8();
- /*boite(43,30,90,19,15);
+ /*g_vm->_screenSurface.drawBox(43,30,90,19,15);
gotoxy(7,5);
write('F3: Encore');
gotoxy(7,6);
@@ -451,7 +450,7 @@ void mennor() {
void premtet() {
dessine(ades, 10, 80);
- boite(18, 79, 155, 91, 15);
+ g_vm->_screenSurface.drawBox(18, 79, 155, 91, 15);
}
/* NIVEAU 5 */
@@ -499,7 +498,7 @@ void t1sama() { /* On entre dans le manoir */ //Translation:
affper(ipers);
caff = 77;
afdes(0);
- boite(223, 47, 155, 91, 15);
+ g_vm->_screenSurface.drawBox(223, 47, 155, 91, 15);
repon(2, 33);
tkey1(false);
mennor();
diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp
index a223e4956f..924b378e14 100644
--- a/engines/mortevielle/ques.cpp
+++ b/engines/mortevielle/ques.cpp
@@ -26,7 +26,6 @@
*/
#include "common/str.h"
-#include "mortevielle/boite.h"
#include "mortevielle/level15.h"
#include "mortevielle/mortevielle.h"
#include "mortevielle/mouse.h"
@@ -101,7 +100,7 @@ namespace Mortevielle {
coor[j + 1].etat = false;
if (res == 1) rep = 10;
else rep = 6;
- boite(80, 33, 40 + tmax * rep, (der - prem) * 8 + 16, 15);
+ g_vm->_screenSurface.drawBox(80, 33, 40 + tmax * rep, (der - prem) * 8 + 16, 15);
rep = 0;
j = 0;
memk = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 09:49:23 +0000