aboutsummaryrefslogtreecommitdiff
path: root/engines/composer/resource.h
diff options
context:
space:
mode:
authorupthorn2012-05-28 12:40:07 -0700
committerangstsmurf2016-10-18 02:09:25 +0200
commitbbcf4a921842bdf6edd3d11741e7b32b82d47b70 (patch)
tree42c707d9c1b1762f46fc26a5e169bbf79f4e1de4 /engines/composer/resource.h
parent4e1f98a155ede58bfa0105f761dfb1e852f47938 (diff)
downloadscummvm-rg350-bbcf4a921842bdf6edd3d11741e7b32b82d47b70.tar.gz
scummvm-rg350-bbcf4a921842bdf6edd3d11741e7b32b82d47b70.tar.bz2
scummvm-rg350-bbcf4a921842bdf6edd3d11741e7b32b82d47b70.zip
COMPOSER: Fixed audio issues after save-game load.
Diffstat (limited to 'engines/composer/resource.h')
-rw-r--r--engines/composer/resource.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/composer/resource.h b/engines/composer/resource.h
index 52748bacd2..55d7c20cc4 100644
--- a/engines/composer/resource.h
+++ b/engines/composer/resource.h
@@ -106,7 +106,7 @@ struct PipeResource {
class Pipe {
public:
- Pipe(Common::SeekableReadStream *stream, uint16 pipeId);
+ Pipe(Common::SeekableReadStream *stream, uint16 id);
virtual ~Pipe();
virtual void nextFrame();
@@ -117,9 +117,11 @@ public:
virtual const Common::Array<uint16> *getScripts() { return NULL; }
#ifdef SAVING_ANYWHERE
- uint16 id() const { return _pipeId; }
+ uint16 pipeId() const { return _pipeId; }
uint32 offset() const { return _offset; }
- void setOffset(uint32 offset) { while (_offset < offset) nextFrame(); }
+ void setOffset(uint32 off) { while (_offset < off) nextFrame(); }
+ typedef Common::HashMap<uint32, Common::List<uint16>> DelMap;
+ Common::Array<DelMap> _bufferedResources;
#endif
protected:
@@ -130,6 +132,7 @@ protected:
TypeMap _types;
#ifdef SAVING_ANYWHERE
uint16 _pipeId;
+ DelMap _currBufferedResources;
#endif
uint32 _offset;