diff options
author | Nicola Mettifogo | 2007-08-07 15:08:45 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-08-07 15:08:45 +0000 |
commit | d800f33ff16ce2d0806b85357b6f3e2111adcfb8 (patch) | |
tree | 3c5ee73f3c5c340292fe5b3f48c06e69575504f2 /engines/parallaction/disk.h | |
parent | d30c3650a358e4e5ba8a548d4e218d7b49fba34a (diff) | |
download | scummvm-rg350-d800f33ff16ce2d0806b85357b6f3e2111adcfb8.tar.gz scummvm-rg350-d800f33ff16ce2d0806b85357b6f3e2111adcfb8.tar.bz2 scummvm-rg350-d800f33ff16ce2d0806b85357b6f3e2111adcfb8.zip |
Turned StaticCnv struct into stock Graphics::Surface, and changed all relevant code.
svn-id: r28484
Diffstat (limited to 'engines/parallaction/disk.h')
-rw-r--r-- | engines/parallaction/disk.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index ae572b1122..d1bb404739 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -28,6 +28,7 @@ #include "parallaction/defs.h" #include "common/file.h" +#include "graphics/surface.h" namespace Parallaction { @@ -38,8 +39,6 @@ class Script; class Font; struct Cnv; -struct StaticCnv; - class Disk { @@ -54,10 +53,10 @@ public: virtual Script* loadScript(const char* name) = 0; virtual Cnv* loadTalk(const char *name) = 0; virtual Cnv* loadObjects(const char *name) = 0; - virtual StaticCnv* loadPointer() = 0; - virtual StaticCnv* loadHead(const char* name) = 0; + virtual Graphics::Surface* loadPointer() = 0; + virtual Graphics::Surface* loadHead(const char* name) = 0; virtual Font* loadFont(const char* name) = 0; - virtual StaticCnv* loadStatic(const char* name) = 0; + virtual Graphics::Surface* loadStatic(const char* name) = 0; virtual Cnv* loadFrames(const char* name) = 0; virtual void loadSlide(const char *filename) = 0; virtual void loadScenery(const char* background, const char* mask) = 0; @@ -128,7 +127,7 @@ private: void unpackBackground(Common::ReadStream *stream, byte *screen, byte *mask, byte *path); Cnv* loadExternalCnv(const char *filename); Cnv* loadCnv(const char *filename); - StaticCnv *loadExternalStaticCnv(const char *filename); + Graphics::Surface *loadExternalStaticCnv(const char *filename); void loadBackground(const char *filename); void loadMaskAndPath(const char *name); void parseDepths(Common::SeekableReadStream &stream); @@ -146,10 +145,10 @@ public: Script* loadScript(const char* name); Cnv* loadTalk(const char *name); Cnv* loadObjects(const char *name); - StaticCnv* loadPointer(); - StaticCnv* loadHead(const char* name); + Graphics::Surface* loadPointer(); + Graphics::Surface* loadHead(const char* name); Font* loadFont(const char* name); - StaticCnv* loadStatic(const char* name); + Graphics::Surface* loadStatic(const char* name); Cnv* loadFrames(const char* name); void loadSlide(const char *filename); void loadScenery(const char* background, const char* mask); @@ -162,7 +161,7 @@ class AmigaDisk_ns : public Disk_ns { protected: Cnv* makeCnv(Common::SeekableReadStream &stream); - StaticCnv* makeStaticCnv(Common::SeekableReadStream &stream); + Graphics::Surface* makeStaticCnv(Common::SeekableReadStream &stream); void patchFrame(byte *dst, byte *dlta, uint16 bytesPerPlane, uint16 height); void unpackFrame(byte *dst, byte *src, uint16 planeSize); void unpackBitmap(byte *dst, byte *src, uint16 numFrames, uint16 bytesPerPlane, uint16 height); @@ -180,10 +179,10 @@ public: Script* loadScript(const char* name); Cnv* loadTalk(const char *name); Cnv* loadObjects(const char *name); - StaticCnv* loadPointer(); - StaticCnv* loadHead(const char* name); + Graphics::Surface* loadPointer(); + Graphics::Surface* loadHead(const char* name); Font* loadFont(const char* name); - StaticCnv* loadStatic(const char* name); + Graphics::Surface* loadStatic(const char* name); Cnv* loadFrames(const char* name); void loadSlide(const char *filename); void loadScenery(const char* background, const char* mask); @@ -214,10 +213,10 @@ public: Script* loadScript(const char* name); Cnv* loadTalk(const char *name); Cnv* loadObjects(const char *name); - StaticCnv* loadPointer(); - StaticCnv* loadHead(const char* name); + Graphics::Surface* loadPointer(); + Graphics::Surface* loadHead(const char* name); Font* loadFont(const char* name); - StaticCnv* loadStatic(const char* name); + Graphics::Surface* loadStatic(const char* name); Cnv* loadFrames(const char* name); void loadSlide(const char *filename); void loadScenery(const char* background, const char* mask); |