diff options
| author | Eugene Sandulenko | 2012-01-08 10:55:13 +0000 |
|---|---|---|
| committer | Strangerke | 2012-04-06 08:19:32 +0200 |
| commit | cd1c72cd9b831013a7c35163259b3ee8db9d6d84 (patch) | |
| tree | 3400fc67ebfa7ca1c7f1516cf6be0b07188e7d20 /engines/mortevielle/mouse.cpp | |
| parent | ca55d928b6cd39287ac37ab3b220ffc0d9e41035 (diff) | |
| download | scummvm-rg350-cd1c72cd9b831013a7c35163259b3ee8db9d6d84.tar.gz scummvm-rg350-cd1c72cd9b831013a7c35163259b3ee8db9d6d84.tar.bz2 scummvm-rg350-cd1c72cd9b831013a7c35163259b3ee8db9d6d84.zip | |
MORTEVIELLE: Fix memory offsets in rest of the places
Diffstat (limited to 'engines/mortevielle/mouse.cpp')
| -rw-r--r-- | engines/mortevielle/mouse.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
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); |