diff options
| author | Paul Gilbert | 2011-12-31 18:21:02 +1100 |
|---|---|---|
| committer | Strangerke | 2012-04-06 08:18:58 +0200 |
| commit | ab089af889567e54fa3dda7483c42a294e1aa2f9 (patch) | |
| tree | 8bf80afcdda1d95d2eca623706dce6c6523e264b /engines/mortevielle/taffich.cpp | |
| parent | 4dd8bce651f43f4f84dccc3655eb598cb9de97cc (diff) | |
| download | scummvm-rg350-ab089af889567e54fa3dda7483c42a294e1aa2f9.tar.gz scummvm-rg350-ab089af889567e54fa3dda7483c42a294e1aa2f9.tar.bz2 scummvm-rg350-ab089af889567e54fa3dda7483c42a294e1aa2f9.zip | |
MORTEVIELLE: More compilation fixes
Diffstat (limited to 'engines/mortevielle/taffich.cpp')
| -rw-r--r-- | engines/mortevielle/taffich.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp index 1a20a1b9f9..d98a600c92 100644 --- a/engines/mortevielle/taffich.cpp +++ b/engines/mortevielle/taffich.cpp @@ -27,6 +27,7 @@ #include "common/file.h" #include "common/str.h" +#include "mortevielle/mor.h" #include "mortevielle/mouse.h" #include "mortevielle/taffich.h" #include "mortevielle/var_mor.h" @@ -98,14 +99,9 @@ void charani(Common::String nom, float passe, int long_) { } void taffich() { - const array<136, 140, byte> tran1 - = {{ 121, 121, 138, 139, 120 }}; - const array<153, 161, byte> tran2 - = {{ - 150, 150, 152, 152, 100, - 110, 159, 100, 100 - } - }; + byte tran1[] = { 121, 121, 138, 139, 120 }; // array<136, 140, byte> + byte tran2[] = { 150, 150, 152, 152, 100, 110, 159, 100, 100 }; // array<153, 161, byte> + int i, m, a, b, cx, handle, npal; float lgt, lhandle; @@ -116,9 +112,9 @@ void taffich() { a = caff; if ((a >= 153) && (a <= 161)) - a = tran2[a]; + a = tran2[a - 153]; else if ((a >= 136) && (a <= 140)) - a = tran1[a]; + a = tran1[a - 136]; b = a; if (maff == a) return; if (a == 16) { |