diff options
author | upthorn | 2012-06-12 15:19:25 -0700 |
---|---|---|
committer | angstsmurf | 2016-10-18 02:10:11 +0200 |
commit | c4c6cce78ea67f26b1c2017ebb15f00612c4d41b (patch) | |
tree | 7df5f90455635f46ea50839b56b0966fe7d4bfa6 /engines/composer/resource.h | |
parent | 027bab88fba3187c2fcf2211d0aba5f6cec09a6c (diff) | |
download | scummvm-rg350-c4c6cce78ea67f26b1c2017ebb15f00612c4d41b.tar.gz scummvm-rg350-c4c6cce78ea67f26b1c2017ebb15f00612c4d41b.tar.bz2 scummvm-rg350-c4c6cce78ea67f26b1c2017ebb15f00612c4d41b.zip |
COMPOSER: Completely removed unnecessary #ifdefs
Diffstat (limited to 'engines/composer/resource.h')
-rw-r--r-- | engines/composer/resource.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/engines/composer/resource.h b/engines/composer/resource.h index 9e297e132a..fc4e20a2cd 100644 --- a/engines/composer/resource.h +++ b/engines/composer/resource.h @@ -116,13 +116,11 @@ public: Common::SeekableReadStream *getResource(uint32 tag, uint16 id, bool buffering); virtual const Common::Array<uint16> *getScripts() { return NULL; } -#ifdef SAVING_ANYWHERE uint16 getPipeId() const { return _pipeId; } virtual uint32 getOffset() const { return _offset; } virtual void setOffset(uint32 offset) { while (_offset < offset) nextFrame(); } typedef Common::HashMap<uint32, Common::List<uint16> > DelMap; DelMap _bufferedResources; -#endif protected: Common::SeekableReadStream *_stream; @@ -130,9 +128,7 @@ protected: typedef Common::HashMap<uint16, PipeResource> ResourceMap; typedef Common::HashMap<uint32, ResourceMap> TypeMap; TypeMap _types; -#ifdef SAVING_ANYWHERE uint16 _pipeId; -#endif uint32 _offset; }; @@ -143,10 +139,8 @@ public: void nextFrame(); const Common::Array<uint16> *getScripts() { return &_scripts; } -#ifdef SAVING_ANYWHERE uint32 getOffset() const { return _currFrame; } void setOffset(uint32 offset) { while (_currFrame < offset) nextFrame(); } -#endif protected: uint32 _currFrame, _numFrames; |