diff options
author | Nicola Mettifogo | 2007-04-16 20:16:18 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-04-16 20:16:18 +0000 |
commit | 987638a71361129748ef0bfac51850d7c8dc3ecc (patch) | |
tree | d0e24f20e358992c817479f7bdb790258cda721c /engines/parallaction/disk.h | |
parent | bf7123548ab5dc5f3eef105ea4d58a30f4844c29 (diff) | |
download | scummvm-rg350-987638a71361129748ef0bfac51850d7c8dc3ecc.tar.gz scummvm-rg350-987638a71361129748ef0bfac51850d7c8dc3ecc.tar.bz2 scummvm-rg350-987638a71361129748ef0bfac51850d7c8dc3ecc.zip |
Now handling fonts with brand-new Font hierarchy. Amiga font have been implemented for dialogues/descriptions, but not for labels yet.
svn-id: r26530
Diffstat (limited to 'engines/parallaction/disk.h')
-rw-r--r-- | engines/parallaction/disk.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index 5e6233f3af..52565a29e7 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -39,6 +39,7 @@ class Table; class Parallaction; class Gfx; class Script; +class Font; struct Cnv; struct StaticCnv; @@ -104,7 +105,7 @@ public: virtual Cnv* loadObjects(const char *name) = 0; virtual StaticCnv* loadPointer() = 0; virtual StaticCnv* loadHead(const char* name) = 0; - virtual Cnv* loadFont(const char* name) = 0; + virtual Font* loadFont(const char* name) = 0; virtual StaticCnv* loadStatic(const char* name) = 0; virtual Cnv* loadFrames(const char* name) = 0; virtual void loadSlide(const char *filename) = 0; @@ -124,6 +125,7 @@ private: void loadMaskAndPath(const char *name); void parseDepths(Common::SeekableReadStream &stream); void parseBackground(Common::SeekableReadStream &stream); + Font *createFont(const char *name, Cnv* cnv); protected: Gfx *_gfx; @@ -138,7 +140,7 @@ public: Cnv* loadObjects(const char *name); StaticCnv* loadPointer(); StaticCnv* loadHead(const char* name); - Cnv* loadFont(const char* name); + Font* loadFont(const char* name); StaticCnv* loadStatic(const char* name); Cnv* loadFrames(const char* name); void loadSlide(const char *filename); @@ -153,6 +155,7 @@ protected: StaticCnv* makeStaticCnv(Common::SeekableReadStream &stream); void unpackBitmap(byte *dst, byte *src, uint16 numFrames, uint16 planeSize); Common::SeekableReadStream *openArchivedFile(const char* name, bool errorOnFileNotFound = false); + Font *createFont(const char *name, Common::SeekableReadStream &stream); public: AmigaDisk(Parallaction *vm); @@ -164,7 +167,7 @@ public: Cnv* loadObjects(const char *name); StaticCnv* loadPointer(); StaticCnv* loadHead(const char* name); - Cnv* loadFont(const char* name); + Font* loadFont(const char* name); StaticCnv* loadStatic(const char* name); Cnv* loadFrames(const char* name); void loadSlide(const char *filename); |