MORTEVIELLE: Replace old calls to afff to use new decode/drawPicture methods

3 files changed, 20 insertions, 15 deletions

diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index ba480ce125..dbecbc9e7d 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -1233,18 +1233,29 @@ void writetp(Common::String s, int t) {
 		g_vm->_screenSurface.writeg(copy(s, 1, 25), t);
 }
 
+/**
+ * Shows the waiting message when changing scenes.
+ * @remarks	Because modern computesr are so much quicker. There's no point in showing
+ * a waiting message between scenes.
+ */
 void messint(int nu) {
-	/* debug('messint'); */
+	/*	Method is deprecated
 	clsf1();
 	clsf2();
 	clsf3();
-	decomp(0x73a2, 1008);
+
+	GfxSurface surface;
+	surface.decode(&mem[0x73a2 * 16 + 1008]);
+
 	WRITE_LE_UINT16(&mem[0x7413 * 16 + 12], 80);
 	WRITE_LE_UINT16(&mem[0x7413 * 16 + 14], 40);
 	writepal(90);
-	afff(gd, 0x73a2, 1008, 0, 0);
-	afff(gd, 0x73a2, 1008, 0, 70);
+
+	g_vm->_screenSurface.drawPicture(surface, 0, 0);
+	g_vm->_screenSurface.drawPicture(surface, 0, 70);
+
 	repon(7, nu);
+	*/
 }
 
 void aniof(int ouf, int num) {
@@ -1257,11 +1268,12 @@ void aniof(int ouf, int num) {
 		else if (num == 4)  num = 3;
 	ad = adani;
 	offset = animof(ouf, num);
-	decomp(ad, offset);
-	hide_mouse();
-	afff(gd, ad, offset, 0, 12);
+
+	GfxSurface surface;
+	surface.decode(&mem[ad * 16 + offset]);
+	g_vm->_screenSurface.drawPicture(surface, 0, 12);
+
 	ecrf1();
-	show_mouse();
 }
 
 void musique(int so) {
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index 77da4a50a0..487231673a 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -313,11 +313,6 @@ void decomp(int seg, int dep) {
 	debugC(1, kMortevielleCore, "TODO: decomp deprecated in faovur of GfxSurface::decode");
 }
 
-// (* external 'c:\mc\affich.com'; *)
-void afff(int Gd, int seg, int dep, int x, int y) {
-	warning("TODO: afff");
-}
-
 // (* external 'c:\mc\reusint.com'; *)
 void musyc(tablint &tb, int nbseg, int att) {
 	warning("TODO: musyc");
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index 739934277c..e0b0480d53 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -437,8 +437,6 @@ extern void s_sauv(int Gd, int y, int dy);
 extern void box(int c, int Gd, int xo, int yo, int xi, int yi, int patt);
 // (* external 'c:\mc\decomp.com'; *)
 extern void decomp(int seg, int dep); 
-// (* external 'c:\mc\affich.com'; *)
-extern void afff(int Gd, int seg, int dep, int x, int y); 
 
 } // End of namespace Mortevielle