aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/disk.h
diff options
context:
space:
mode:
authorNicola Mettifogo2009-06-12 08:51:05 +0000
committerNicola Mettifogo2009-06-12 08:51:05 +0000
commit36828287ad6041de7c8e98d0fe2979730a8b094f (patch)
treec4ea87c25281a75638a4e64aab367659ae2d4a6a /engines/parallaction/disk.h
parentb9017519fa1408311199bd0b41c271e35afee02c (diff)
downloadscummvm-rg350-36828287ad6041de7c8e98d0fe2979730a8b094f.tar.gz
scummvm-rg350-36828287ad6041de7c8e98d0fe2979730a8b094f.tar.bz2
scummvm-rg350-36828287ad6041de7c8e98d0fe2979730a8b094f.zip
* Moved the updated IFF code from Parallaction to common/
* Updated Parallaction and SAGA to use the new decoder infrastructure. svn-id: r41465
Diffstat (limited to 'engines/parallaction/disk.h')
-rw-r--r--engines/parallaction/disk.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 936be1e140..a9da429473 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -33,7 +33,7 @@
#include "common/file.h"
#include "graphics/surface.h"
-#include "parallaction/iff.h"
+#include "graphics/iff.h"
@@ -99,14 +99,14 @@ struct ILBMLoader {
uint32 _mode;
byte* _intBuffer;
uint32 _numCRNG;
- ILBMDecoder _decoder;
+ Graphics::ILBMDecoder _decoder;
ILBMLoader(uint32 bodyMode, byte *palette = 0, PaletteFxRange *crng = 0);
ILBMLoader(Graphics::Surface *surf, byte *palette = 0, PaletteFxRange *crng = 0);
ILBMLoader(MaskBuffer *buffer);
ILBMLoader(PathBuffer *buffer);
- bool callback(IFFChunk &chunk);
+ bool callback(Common::IFFChunk &chunk);
void setupBuffer(uint32 w, uint32 h);
void load(Common::ReadStream *in, bool disposeStream = false);
};