aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur/files.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/voyeur/files.h')
-rw-r--r--engines/voyeur/files.h23
1 files changed, 13 insertions, 10 deletions
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 0e736c9c08..49c0b2c8a4 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -82,7 +82,7 @@ public:
byte *_boltPageFrame;
public:
- BoltFilesState();
+ BoltFilesState(VoyeurEngine *vm);
byte *decompress(byte *buf, int size, int mode);
void nextBlock();
@@ -204,10 +204,11 @@ public:
class FilesManager {
public:
- BoltFilesState _boltFilesState;
+ BoltFilesState *_boltFilesState;
BoltFile *_curLibPtr;
public:
FilesManager(VoyeurEngine *vm);
+ ~FilesManager();
bool openBoltLib(const Common::String &filename, BoltFile *&boltFile);
byte *fload(const Common::String &filename, int *size);
@@ -230,7 +231,16 @@ public:
virtual ~RectResource() {}
};
-enum DisplayFlag { DISPFLAG_1 = 1, DISPFLAG_2 = 2, DISPFLAG_4 = 4, DISPFLAG_8 = 8,
+/* bvoy.blt resource types */
+
+enum PictureFlag {
+ PICFLAG_2 = 2, PICFLAG_PIC_OFFSET = 8, PICFLAG_CLEAR_SCREEN = 0x10,
+ PICFLAG_20 = 0x20, PICFLAG_HFLIP = 0x40, PICFLAG_VFLIP = 0x80, PICFLAG_100 = 0x100,
+ PICFLAG_CLEAR_SCREEN00 = 0x1000
+};
+
+enum DisplayFlag {
+ DISPFLAG_1 = 1, DISPFLAG_2 = 2, DISPFLAG_4 = 4, DISPFLAG_8 = 8,
DISPFLAG_10 = 0x10, DISPFLAG_20 = 0x20, DISPFLAG_40 = 0x40, DISPFLAG_80 = 0x80,
DISPFLAG_100 = 0x100, DISPFLAG_200 = 0x200, DISPFLAG_400 = 0x400,
DISPFLAG_800 = 0x800, DISPFLAG_1000 = 0x1000, DISPFLAG_2000 = 0x2000,
@@ -267,13 +277,6 @@ public:
bool clipRect(Common::Rect &rect);
};
-/* bvoy.blt resource types */
-
-enum PictureFlag { PICFLAG_2 = 2, PICFLAG_PIC_OFFSET = 8, PICFLAG_CLEAR_SCREEN = 0x10,
- PICFLAG_20 = 0x20, PICFLAG_HFLIP = 0x40, PICFLAG_VFLIP = 0x80, PICFLAG_100 = 0x100,
- PICFLAG_CLEAR_SCREEN00 = 0x1000
-};
-
class PictureResource: public DisplayResource {
private:
/**