MORTEVIELLE: various cleanup and renaming

3 files changed, 26 insertions, 22 deletions

diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 20e2898121..c58f6b3309 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -345,13 +345,13 @@ bool Ques::show() {
 			with.x2 = (tmax * 3 + 55) * res;
 			with.y1 = 27 + j * 8;
 			with.y2 = 34 + j * 8;
-			with.etat = true;
+			with.enabled = true;
 
 			while ((int)chaines[j].size() < tmax) {
 				chaines[j] += ' ';
 			}
 		}
-		coor[j + 1].etat = false;
+		coor[j + 1].enabled = false;
 		if (res == 1)
 			rep = 10;
 		else
@@ -367,8 +367,8 @@ bool Ques::show() {
 			CHECK_QUIT0;
 
 			k = 1;
-			while (coor[k].etat && ! dans_rect(coor[k]))  k = k + 1;
-			if (coor[k].etat) {
+			while (coor[k].enabled && ! dans_rect(coor[k]))  k = k + 1;
+			if (coor[k].enabled) {
 				if ((memk != 0) && (memk != k)) {
 //					for (j = 1; j <= tmax; ++j)
 //						st[j] = chaines[memk][j];
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index 759c29ab9b..a304592515 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -204,7 +204,7 @@ int tbi[256];
 chariot c1, c2, c3;
 float addfix;
 t_pcga palsav[91];
-doublet tabpal[91][17];
+Common::Point tabpal[91][17];
 t_pcga palcga[91];
 pattern tpt[15];
 
@@ -248,6 +248,7 @@ int port[0xfff];
 byte mem[65536 * 16];
 
 void intr(int intNum, registres &regs) {
+	warning("STUBBED: Call to DOS interrupt #%d", intNum);
 }
 
 /**
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index 069a603dd2..bc63aa98d3 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -75,23 +75,24 @@ namespace Mortevielle {
 
 const float freq0 = 1.19318e6;
 
-const int seg_syst = 0x6fed;
-const int segmou = 0x6f00;
-const int segdon = 0x6c00;
 const int adani = 0x7314;
-const int adword = 0x4000;
-const int adtroct = 0x406b;
 const int adbruit = 0x5cb0;/*2C00;*/
-const int adbruit1 = 0x6924;/*3874;*/
-const int adbruit2 = 0x6b30;/*3A80;*/
+const int adbruit1 = 0x6924;
 const int adbruit3 = 0x6ba6;/*3AF6;*/
 const int adbruit5 = 0x3b50;
 const int adson = 0x5cb0;/*2C00;*/
-const int adson2 = 0x60b0;/*3000;*/
+const int adtroct = 0x406b;
+const int adword = 0x4000;
 const int offsetb1 = 6;
-const int offsetb2 = 4;
 const int offsetb3 = 6;
 
+// Useless constants
+//const int segdon = 0x6c00;
+//const int adbruit2 = 0x6b30;/*3A80;*/
+//const int adson2 = 0x60b0;/*3000;*/
+//const int seg_syst = 0x6fed;
+//const int offsetb2 = 4;
+
 const int null = 255;
 
 const int tempo_mus = 71;
@@ -168,6 +169,7 @@ struct sav_chaine {
 	bool ipre;
 	char heure;
 };
+
 struct registres {
 	int ax, bx, cx, dx, bp, si, di, ds, es, flags;
 };
@@ -177,22 +179,23 @@ struct ind {
 	byte point;
 };
 
-typedef int word1;
 struct chariot {
 	int val,
-	        code,
-	        acc,
-	        freq,
-	        rep;
+		code,
+		acc,
+		freq,
+		rep;
 };
 
+/*
 struct doublet {
 	byte x, y;
 };
+*/
 
 struct rectangle {
 	int x1, x2, y1, y2;
-	bool etat;
+	bool enabled;
 };
 
 struct pattern {
@@ -214,7 +217,7 @@ struct t_pcga {
 };
 
 typedef int tablint[256];
-typedef doublet tabdb[17];
+//typedef Common::Point tabdb[17];
 typedef int tfxx[108];
 
 /*---------------------------------------------------------------------------*/
@@ -351,7 +354,7 @@ extern int tbi[256];
 extern chariot c1, c2, c3;
 extern float addfix;
 extern t_pcga palsav[91];
-extern doublet tabpal[91][17];
+extern Common::Point tabpal[91][17];
 extern t_pcga palcga[91];
 extern pattern tpt[15];