diff options
author | Torbjörn Andersson | 2010-04-28 20:47:49 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2010-04-28 20:47:49 +0000 |
commit | 2b4093a41f0b9af397f1af43d618cee5307946a9 (patch) | |
tree | d2f10505e6d3c83002a227f9f8b0da887141ddda /engines | |
parent | 1a1d99724a989ad81f341f5e7b62737de5f522a6 (diff) | |
download | scummvm-rg350-2b4093a41f0b9af397f1af43d618cee5307946a9.tar.gz scummvm-rg350-2b4093a41f0b9af397f1af43d618cee5307946a9.tar.bz2 scummvm-rg350-2b4093a41f0b9af397f1af43d618cee5307946a9.zip |
Committed my proposed fix for bug #2970211 ("DRASCULA: missing german
translation"), after a brief discussion with Fingolfin to make sure I wasn't
doing something silly.
svn-id: r48833
Diffstat (limited to 'engines')
-rw-r--r-- | engines/drascula/detection.cpp | 10 | ||||
-rw-r--r-- | engines/drascula/drascula.h | 2 | ||||
-rw-r--r-- | engines/drascula/resource.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index a4a6426a5a..76d48b7b89 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -50,7 +50,7 @@ void DrasculaEngine::loadArchives() { if (getFeatures() & GF_PACKED) { for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) - _archives.registerArchive(ag->fileName); + _archives.registerArchive(ag->fileName, ag->fileType); } _archives.enableFallback(true); @@ -103,7 +103,7 @@ static const DrasculaGameDescription gameDescriptions[] = { 0, { {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563}, - {"packet.003", 0, "e8f4dc6091037329bab4ddb1cba35807", 719728}, + {"packet.003", 1, "e8f4dc6091037329bab4ddb1cba35807", 719728}, {NULL, 0, NULL, 0} }, Common::DE_DEU, @@ -120,7 +120,7 @@ static const DrasculaGameDescription gameDescriptions[] = { 0, { {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563}, - {"packet.002", 0, "4401123400f22f212b89f15fb4b43013", 721122}, + {"packet.002", 1, "4401123400f22f212b89f15fb4b43013", 721122}, {NULL, 0, NULL, 0} }, Common::FR_FRA, @@ -214,7 +214,7 @@ static const DrasculaGameDescription gameDescriptions[] = { 0, { {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563}, - {"packet.004", 0, "a289d3cf80d50f25ec569b653248437e", 17205838}, + {"packet.004", 1, "a289d3cf80d50f25ec569b653248437e", 17205838}, {NULL, 0, NULL, 0} }, Common::ES_ESP, @@ -231,7 +231,7 @@ static const DrasculaGameDescription gameDescriptions[] = { 0, { {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563}, - {"packet.005", 0, "58caac54b891f5d7f335e710e45e5d29", 16209623}, + {"packet.005", 1, "58caac54b891f5d7f335e710e45e5d29", 16209623}, {NULL, 0, NULL, 0} }, Common::IT_ITA, diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 7367d4d84e..4876cf3390 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -259,7 +259,7 @@ public: void enableFallback(bool val) { _fallBack = val; } - void registerArchive(const Common::String &filename); + void registerArchive(const Common::String &filename, int priority); Common::SeekableReadStream *open(const Common::String &filename); diff --git a/engines/drascula/resource.cpp b/engines/drascula/resource.cpp index 01f8d1ed5f..1226bc2e10 100644 --- a/engines/drascula/resource.cpp +++ b/engines/drascula/resource.cpp @@ -35,8 +35,8 @@ ArchiveMan::ArchiveMan() { ArchiveMan::~ArchiveMan() { } -void ArchiveMan::registerArchive(const Common::String &filename) { - add(filename, Common::makeArjArchive(filename)); +void ArchiveMan::registerArchive(const Common::String &filename, int priority) { + add(filename, Common::makeArjArchive(filename), priority); } Common::SeekableReadStream *ArchiveMan::open(const Common::String &filename) { |