diff options
Diffstat (limited to 'engines/cge/bitmap.h')
| -rw-r--r-- | engines/cge/bitmap.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/engines/cge/bitmap.h b/engines/cge/bitmap.h index 3e195fad14..bb935e7049 100644 --- a/engines/cge/bitmap.h +++ b/engines/cge/bitmap.h @@ -28,11 +28,14 @@ #ifndef CGE_BITMAP_H #define CGE_BITMAP_H -#include "cge/fileio.h" -//#include "cge/general.h" +#include "cge/general.h" +#include "common/file.h" namespace CGE { +class CGEEngine; +class EncryptedStream; + #define kMaxPath 128 enum { kBmpEOI = 0x0000, @@ -51,6 +54,7 @@ struct HideDesc { #include "common/pack-end.h" class Bitmap { + CGEEngine *_vm; char *forceExt(char *buf, const char *name, const char *ext); bool loadVBM(EncryptedStream *f); public: @@ -62,10 +66,10 @@ public: int32 _map; HideDesc *_b; - Bitmap(const char *fname); - Bitmap(uint16 w, uint16 h, uint8 *map); - Bitmap(uint16 w, uint16 h, uint8 fill); - Bitmap(const Bitmap &bmp); + Bitmap(CGEEngine *vm, const char *fname); + Bitmap(CGEEngine *vm, uint16 w, uint16 h, uint8 *map); + Bitmap(CGEEngine *vm, uint16 w, uint16 h, uint8 fill); + Bitmap(CGEEngine *vm, const Bitmap &bmp); ~Bitmap(); static void init(); |