diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:37:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:46:44 +0200 |
| commit | 02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0 (patch) | |
| tree | 72b64a67ebeca41e9b83593da80850e848a99e2e /engines/composer/resource.cpp | |
| parent | 1539023834a2ad7cf8942711d60983891a10a82a (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.gz scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.bz2 scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.zip | |
Merge branch 'master'
Conflicts:
configure
base/plugins.cpp
Diffstat (limited to 'engines/composer/resource.cpp')
| -rw-r--r-- | engines/composer/resource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp index a4e292747c..83e49971fb 100644 --- a/engines/composer/resource.cpp +++ b/engines/composer/resource.cpp @@ -240,7 +240,7 @@ bool ComposerArchive::openStream(Common::SeekableReadStream *stream) { res.flags = flags; debug(4, "Id %d, offset %d, size %d, flags %08x", id, offset, size, flags); } - + stream->seek(oldPos); } |