aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur/files.h
diff options
context:
space:
mode:
authorPaul Gilbert2013-12-30 10:25:46 +1100
committerPaul Gilbert2013-12-30 10:25:46 +1100
commit485c19b569bce6b69dd8b90c5304dca334f9ddc5 (patch)
treee49eb7a3046b11c7300c453de05b8ebf035dced4 /engines/voyeur/files.h
parentf1686fcf16de1ed3303369f6f3b4c29daeb25d44 (diff)
downloadscummvm-rg350-485c19b569bce6b69dd8b90c5304dca334f9ddc5.tar.gz
scummvm-rg350-485c19b569bce6b69dd8b90c5304dca334f9ddc5.tar.bz2
scummvm-rg350-485c19b569bce6b69dd8b90c5304dca334f9ddc5.zip
VOYEUR: Clean up playAVideoDuration
Diffstat (limited to 'engines/voyeur/files.h')
-rw-r--r--engines/voyeur/files.h24
1 files changed, 8 insertions, 16 deletions
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 832e157b7b..47a6df5c8f 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -41,10 +41,9 @@ class ViewPortResource;
class ViewPortListResource;
class FontResource;
class CMapResource;
-class VInitCyclResource;
+class VInitCycleResource;
class PtrResource;
class ControlResource;
-class CycleResource;
class ThreadResource;
#define DECOMPRESS_SIZE 0x7000
@@ -205,8 +204,7 @@ public:
FontResource *_fontResource;
FontInfoResource *_fontInfoResource;
CMapResource *_cMapResource;
- VInitCyclResource *_vInitCyclResource;
- CycleResource *_cycleResource; // TODO: Dup with VInit?
+ VInitCycleResource *_vInitCycleResource;
// stampblt.blt resource types
PtrResource *_ptrResource;
@@ -405,12 +403,15 @@ public:
void startFade();
};
-class VInitCyclResource {
+class VInitCycleResource {
public:
byte *_ptr[4];
public:
- VInitCyclResource(BoltFilesState &state, const byte *src);
- virtual ~VInitCyclResource() {}
+ VInitCycleResource(BoltFilesState &state, const byte *src);
+ virtual ~VInitCycleResource() {}
+
+ void vStartCycle();
+ void vStopCycle();
};
/* stampblt.blt resources */
@@ -433,15 +434,6 @@ public:
virtual ~ControlResource() {}
};
-class CycleResource {
-public:
- CycleResource(BoltFilesState &state, const byte *src) {}
- virtual ~CycleResource() {}
-
- void vStartCycle();
- void vStopCycle();
-};
-
class ThreadResource {
public:
static int _stampFlags;