diff options
| author | Strangerke | 2012-09-05 03:20:30 -0700 |
|---|---|---|
| committer | Strangerke | 2012-09-05 03:20:30 -0700 |
| commit | 5780748b62119988dc219d5c636681766065bd75 (patch) | |
| tree | b9a1a11849d6cd956b709ec0e21c820b042edac6 /engines/agos/res.cpp | |
| parent | 6472ef86bbee92bc02a67d87677dc6b0925a0362 (diff) | |
| parent | c737e6429866f18638a6b61103e4e1c7095407e6 (diff) | |
| download | scummvm-rg350-5780748b62119988dc219d5c636681766065bd75.tar.gz scummvm-rg350-5780748b62119988dc219d5c636681766065bd75.tar.bz2 scummvm-rg350-5780748b62119988dc219d5c636681766065bd75.zip | |
Merge pull request #273 from fuzzie/tony
Tony engine (Tony Tough)
Diffstat (limited to 'engines/agos/res.cpp')
| -rw-r--r-- | engines/agos/res.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index 0305879390..2e44a6575c 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -23,6 +23,8 @@ // Resource file routines for Simon1/Simon2 +#include "common/archive.h" +#include "common/installshield_cab.h" #include "common/file.h" #include "common/memstream.h" #include "common/textconsole.h" @@ -31,7 +33,6 @@ #include "agos/agos.h" #include "agos/intern.h" #include "agos/sound.h" -#include "agos/installshield_cab.h" #include "common/zlib.h" @@ -43,7 +44,10 @@ ArchiveMan::ArchiveMan() { #ifdef ENABLE_AGOS2 void ArchiveMan::registerArchive(const Common::String &filename, int priority) { - add(filename, makeInstallShieldArchive(filename), priority); + Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(filename); + + if (stream) + add(filename, makeInstallShieldArchive(stream, DisposeAfterUse::YES), priority); } #endif |