MORTEVIELLE: Fix memory offsets in rest of the places

4 files changed, 29 insertions, 29 deletions

diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp
index bd908b47c4..d7193bfc61 100644
--- a/engines/mortevielle/level15.cpp
+++ b/engines/mortevielle/level15.cpp
@@ -61,8 +61,8 @@ void outbloc(int n, pattern p, t_nhom pal) {
 
 	ad = n * 404 + 0xd700;
 	{
-		WRITE_LE_UINT16(&mem[0x6000 + ad], p.tax);
-		WRITE_LE_UINT16(&mem[0x6000 + ad + 2], p.tay);
+		WRITE_LE_UINT16(&mem[0x6000 * 16 + ad], p.tax);
+		WRITE_LE_UINT16(&mem[0x6000 * 16 + ad + 2], p.tay);
 		ad = ad + 4;
 		for (i = 1; i <= p.tax; i ++)
 			for (j = 1; j <= p.tay; j ++)
@@ -102,8 +102,8 @@ void pictout(int seg, int dep, int x, int y) {
 		mem[0x7000 * 16 + 2] = 0;
 		mem[0x7000 * 16 + 32] = 15;
 	}
-	if ((caff != 51) && (READ_LE_UINT16(&mem[0x7000 + 0x4138]) > 0x100))
-		WRITE_LE_UINT16(&mem[0x7000 + 0x4138], 0x100);
+	if ((caff != 51) && (READ_LE_UINT16(&mem[0x7000 * 16 + 0x4138]) > 0x100))
+		WRITE_LE_UINT16(&mem[0x7000 * 16 + 0x4138], 0x100);
 	afff(gd, seg, dep, x, y);
 }
 
@@ -192,7 +192,7 @@ int animof(int ouf, int num) {
 	nani = mem[adani * 16 + 1];
 	aux = num;
 	if (ouf != 1)  aux = aux + nani;
-	animof_result = (nani << 2) + 2 + swap(READ_LE_UINT16(&mem[adani + (aux << 1)]));
+	animof_result = (nani << 2) + 2 + swap(READ_LE_UINT16(&mem[adani * 16 + (aux << 1)]));
 	/*aux:= nani shl 2 + 2;
 	if ouf=1 then aux:= aux+ swap(WRITE_LE_UINT16(&mem[adani: num shl 1])
 	         else aux:= aux+ swap(WRITE_LE_UINT16(&mem[adani: (nani+num) shl 1]);
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index e9366b0506..373a80029a 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -1231,8 +1231,8 @@ void messint(int nu) {
 	clsf2();
 	clsf3();
 	decomp(0x73a2, 1008);
-	WRITE_LE_UINT16(&mem[0x7413 + 12], 80);
-	WRITE_LE_UINT16(&mem[0x7413 + 14], 40);
+	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);
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index e7eb225edf..2fc6e1033b 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -102,10 +102,10 @@ void hide_mouse() {
 			k = 0;
 			j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 2);
 			do {
-				WRITE_LE_UINT16(&mem[0xb000 + j], s_s[0][k]);
-				WRITE_LE_UINT16(&mem[0xb800 + j + 2], s_s[1][k]);
-				WRITE_LE_UINT16(&mem[0xba00 + j], s_s[2][k]);
-				WRITE_LE_UINT16(&mem[0xba00 + j + 2], s_s[3][k]);
+				WRITE_LE_UINT16(&mem[0xb000 * 16 + j], s_s[0][k]);
+				WRITE_LE_UINT16(&mem[0xb800 * 16 + j + 2], s_s[1][k]);
+				WRITE_LE_UINT16(&mem[0xba00 * 16 + j], s_s[2][k]);
+				WRITE_LE_UINT16(&mem[0xba00 * 16 + j + 2], s_s[3][k]);
 				j = j + 80;
 				k = succ(int, k);
 			} while (!(k >= 5));
@@ -118,10 +118,10 @@ void hide_mouse() {
 				j = p_o_s;
 				do {
 					if (imp) {
-						WRITE_LE_UINT16(&mem[0xb800 + j], s_s[i][k]);
+						WRITE_LE_UINT16(&mem[0xb800 * 16 + j], s_s[i][k]);
 						j = j + 80 - 0x2000;
 					} else {
-						WRITE_LE_UINT16(&mem[0xb800 + j], s_s[i][k]);
+						WRITE_LE_UINT16(&mem[0xb800 * 16 + j], s_s[i][k]);
 						j = j + 0x2000;
 					}
 					imp = ! imp;
@@ -155,7 +155,7 @@ void hide_mouse() {
 			j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 3);
 			for (i = 0; i <= 5; i ++) {
 				for (k = 0; k <= 3; k ++) 
-					WRITE_LE_UINT16(&mem[0xb000 + k * 0x200 + j], s_s[i][k]);
+					WRITE_LE_UINT16(&mem[0xb000 * 16 + k * 0x200 + j], s_s[i][k]);
 				j = j + 80;
 			}
 		}
@@ -165,8 +165,8 @@ void hide_mouse() {
 			k = 0;
 			do {
 				for (i = 0; i <= 3; i ++) {
-					WRITE_LE_UINT16(&mem[0xb800 + 0x200 * i + j], s_s[k][i + (k << 2)]);
-					WRITE_LE_UINT16(&mem[0xb800 + 0x200 * i + j + 2], s_s[k + 3][i + (k << 2)]);
+					WRITE_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j], s_s[k][i + (k << 2)]);
+					WRITE_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j + 2], s_s[k + 3][i + (k << 2)]);
 				}
 				j = j + 160;
 				k = succ(int, k);
@@ -192,10 +192,10 @@ void show_mouse() {
 		k = 0;
 		j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 2);
 		do {
-			s_s[0][k] = READ_LE_UINT16(&mem[0xb800 + j]);
-			s_s[1][k] = READ_LE_UINT16(&mem[0xb800 + j + 2]);
-			s_s[2][k] = READ_LE_UINT16(&mem[0xba00 + j]);
-			s_s[3][k] = READ_LE_UINT16(&mem[0xba00 + j + 2]);
+			s_s[0][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j]);
+			s_s[1][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j + 2]);
+			s_s[2][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j]);
+			s_s[3][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j + 2]);
 			j = j + 80;
 			k = succ(int, k);
 		} while (!(k >= 5));
@@ -209,10 +209,10 @@ void show_mouse() {
 			k = 0;
 			do {
 				if (imp) {
-					s_s[i][k] = READ_LE_UINT16(&mem[0xb800 + j]);
+					s_s[i][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j]);
 					j = j + 80 - 0x2000;
 				} else {
-					s_s[i][k] = READ_LE_UINT16(&mem[0xb800 + j]);
+					s_s[i][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j]);
 					j = j + 0x2000;
 				}
 				imp = ! imp;
@@ -229,7 +229,7 @@ void show_mouse() {
 			k = 0;
 			j = p_o_s;
 			do {
-				s_s[l][k] = mem[0xa000 * 16 + j] + (mem[0xa000 + succ(int, j)] << 8);
+				s_s[l][k] = mem[0xa000 * 16 + j] + (mem[0xa000 * 16 + succ(int, j)] << 8);
 				j = j + 80;
 				k = succ(int, k);
 			} while (!(k >= 8));
@@ -241,7 +241,7 @@ void show_mouse() {
 		j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 3);
 		for (i = 0; i <= 5; i ++) {
 			for (k = 0; k <= 3; k ++)
-				s_s[i][k] = READ_LE_UINT16(&mem[0xb000 + k * 0x200 + j]);
+				s_s[i][k] = READ_LE_UINT16(&mem[0xb000 * 16 + k * 0x200 + j]);
 			j = j + 80;
 		}
 	}
@@ -251,8 +251,8 @@ void show_mouse() {
 		k = 0;
 		do {
 			for (i = 0; i <= 3; i ++) {
-				s_s[k][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 + 0x200 * i + j]);
-				s_s[k + 3][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 + 0x200 * i + j + 2]);
+				s_s[k][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j]);
+				s_s[k + 3][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j + 2]);
 			}
 			j = j + 160;
 			k = succ(int, k);
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp
index 1cb0f76325..619cf7a89a 100644
--- a/engines/mortevielle/taffich.cpp
+++ b/engines/mortevielle/taffich.cpp
@@ -63,7 +63,7 @@ void chardes(Common::String nom, float passe, int long_) {
 	}
 	f.close();
 
-	for (i = p; i <= long_ + p; i ++) mem[0x7000 * 16 + i - p] = mem[0x6000 + i];
+	for (i = p; i <= long_ + p; i ++) mem[0x7000 * 16 + i - p] = mem[0x6000 * 16 + i];
 	/*$i+*/
 }
 
@@ -96,7 +96,7 @@ void charani(Common::String nom, float passe, int long_) {
 	}
 	f.close();
 
-	for (i = p; i <= long_ + p; i ++) mem[0x7314 * 16 + i - p] = mem[0x6000 + i];
+	for (i = p; i <= long_ + p; i ++) mem[0x7314 * 16 + i - p] = mem[0x6000 * 16 + i];
 }
 
 void taffich() {
@@ -182,7 +182,7 @@ void taffich() {
 	chardes(nom, lgt, handle);
 	if (gd == her) {
 		for (i = 0; i <= 15; i ++) {
-			palh = READ_LE_UINT16(&mem[0x7000 + (succ(int, i) << 1)]);
+			palh = READ_LE_UINT16(&mem[0x7000 * 16 + (succ(int, i) << 1)]);
 			alllum[i] = (palh & 15) + (((uint)palh >> 12) & 15) + (((uint)palh >> 8) & 15);
 		}
 		for (i = 0; i <= 15; i ++) {