aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2012-01-10 20:42:07 +1100
committerStrangerke2012-04-06 08:19:35 +0200
commit41ddc9958ae4d1256f392b9e92fff241566ab930 (patch)
tree07989d340fe2d3a503d6090019d803ee97b3c6e4 /engines
parentfd490f3aebabc99a225bcd25b67770abe6caf032 (diff)
downloadscummvm-rg350-41ddc9958ae4d1256f392b9e92fff241566ab930.tar.gz
scummvm-rg350-41ddc9958ae4d1256f392b9e92fff241566ab930.tar.bz2
scummvm-rg350-41ddc9958ae4d1256f392b9e92fff241566ab930.zip
MORTEVIELLE: Fix data loading in charani() method
Diffstat (limited to 'engines')
-rw-r--r--engines/mortevielle/level15.cpp5
-rw-r--r--engines/mortevielle/taffich.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp
index d7193bfc61..86319e0e07 100644
--- a/engines/mortevielle/level15.cpp
+++ b/engines/mortevielle/level15.cpp
@@ -26,6 +26,7 @@
*/
#include "common/file.h"
+#include "mortevielle/graphics.h"
#include "mortevielle/level15.h"
#include "mortevielle/mouse.h"
#include "mortevielle/var_mor.h"
@@ -97,6 +98,10 @@ void writepal(int n) {
void pictout(int seg, int dep, int x, int y) {
+ GfxSurface surface;
+ surface.decode(&mem[0x7000 * 16]);
+
+warning("TODO: complete picture decoding");
decomp(seg, dep);
if (gd == her) {
mem[0x7000 * 16 + 2] = 0;
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp
index 8e8e3de6b6..78eccbbaf1 100644
--- a/engines/mortevielle/taffich.cpp
+++ b/engines/mortevielle/taffich.cpp
@@ -90,7 +90,7 @@ void charani(Common::String nom, float passe, int long_) {
l = long_ + p;
i = 0;
while (l > 0) {
- f.read(&mem[0x6000 * 16 + i], 1);
+ f.read(&mem[0x6000 * 16 + i], 128);
testfi();
l = l - 128;
i = i + 128;