diff options
author | Filippos Karapetis | 2008-06-04 17:41:40 +0000 |
---|---|---|
committer | Filippos Karapetis | 2008-06-04 17:41:40 +0000 |
commit | f21a15cbbbb85780aad26a9df648f0ee16349ea1 (patch) | |
tree | b1222553acd6da9511737c4d4f70ed91bbfcd079 /engines | |
parent | 73da6ab51ef86b89adad28a935ac22bad257b834 (diff) | |
download | scummvm-rg350-f21a15cbbbb85780aad26a9df648f0ee16349ea1.tar.gz scummvm-rg350-f21a15cbbbb85780aad26a9df648f0ee16349ea1.tar.bz2 scummvm-rg350-f21a15cbbbb85780aad26a9df648f0ee16349ea1.zip |
Removed decompressPic() and fixed the animation of Von Braun and his glass cage
svn-id: r32541
Diffstat (limited to 'engines')
-rw-r--r-- | engines/drascula/animation.cpp | 2 | ||||
-rw-r--r-- | engines/drascula/drascula.cpp | 4 | ||||
-rw-r--r-- | engines/drascula/drascula.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index d3d6011599..14d73ddd3d 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -836,7 +836,7 @@ void DrasculaEngine::animation_14_2() { flags[24] = 1; - decompressPic(drawSurface1, 1); + memcpy(drawSurface1, screenSurface, 64000); playSound(7); hiccup(15); diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 7675bd9fa2..a60a6d0f82 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -283,10 +283,6 @@ void DrasculaEngine::loadPic(const char *NamePcc, byte *targetSurface, int color _arj.read(cPal, 768); _arj.close(); - decompressPic(targetSurface, colorCount); -} - -void DrasculaEngine::decompressPic(byte *targetSurface, int colorCount) { memcpy(targetSurface, pcxBuffer, 64000); free(pcxBuffer); setRGB((byte *)cPal, colorCount); diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 65308bc14a..ae26d60475 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -185,7 +185,6 @@ public: } void loadPic(const char *NamePcc, byte *targetSurface, int colorCount = 1); - void decompressPic(byte *targetSurface, int colorCount); typedef char DacPalette256[256][3]; |