diff options
| author | David Turner | 2011-01-28 01:09:27 +0000 |
|---|---|---|
| committer | David Turner | 2011-01-28 01:09:27 +0000 |
| commit | c17e3d38bd83eee6967d378a16be7222c07a33ff (patch) | |
| tree | ac8148284471c464b46ece129aec45a2402dfdb6 | |
| parent | e2abf3b000060fea2bf873644409a81849c181ca (diff) | |
| download | scummvm-rg350-c17e3d38bd83eee6967d378a16be7222c07a33ff.tar.gz scummvm-rg350-c17e3d38bd83eee6967d378a16be7222c07a33ff.tar.bz2 scummvm-rg350-c17e3d38bd83eee6967d378a16be7222c07a33ff.zip | |
DRASCULA: Fix for Duplicate Registering of Archive.
A warning occurs that the archive, Packet.001 has been added twice.
This is due to a hack to get the detector priority listing correct.
This fix prevents this causing a multiple add of the same archive.
svn-id: r55580
| -rw-r--r-- | engines/drascula/detection.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 96de750c9c..8729290d52 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -30,7 +30,6 @@ #include "drascula/drascula.h" - namespace Drascula { struct DrasculaGameDescription { @@ -49,8 +48,10 @@ void DrasculaEngine::loadArchives() { const ADGameFileDescription *ag; if (getFeatures() & GF_PACKED) { - for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) - _archives.registerArchive(ag->fileName, ag->fileType); + for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) { + if (!_archives.hasArchive(ag->fileName)) + _archives.registerArchive(ag->fileName, ag->fileType); + } } _archives.enableFallback(true); @@ -63,13 +64,11 @@ static const PlainGameDescriptor drasculaGames[] = { {0, 0} }; - namespace Drascula { using Common::GUIO_NONE; static const DrasculaGameDescription gameDescriptions[] = { - { // Drascula English version { |