[Scummvm-cvs-logs] SF.net SVN: scummvm:[48834] scummvm/branches/branch-1-1-0

[eriktorbjorn at users.sourceforge.net]

Revision: 48834
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48834&view=rev
Author:   eriktorbjorn
Date:     2010-04-28 20:55:52 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Backported fix for bug #2970211 ("DRASCULA: missing german translation").

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/NEWS
    scummvm/branches/branch-1-1-0/engines/drascula/detection.cpp
    scummvm/branches/branch-1-1-0/engines/drascula/drascula.h
    scummvm/branches/branch-1-1-0/engines/drascula/resource.cpp

Modified: scummvm/branches/branch-1-1-0/NEWS
===================================================================
--- scummvm/branches/branch-1-1-0/NEWS	2010-04-28 20:47:49 UTC (rev 48833)
+++ scummvm/branches/branch-1-1-0/NEWS	2010-04-28 20:55:52 UTC (rev 48834)
@@ -8,6 +8,10 @@
  General:
    - Fixed several minor bugs here and there.
 
+ Drascula:
+   - Fixed regression that caused some texts to always be in English, even when
+     using another language. (#2970211 - DRASCULA: missing german translation)
+
  KYRA:
    - Fixed a bug which caused the DOS versions to crash before the credits when
      AdLib music is selected.

Modified: scummvm/branches/branch-1-1-0/engines/drascula/detection.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/drascula/detection.cpp	2010-04-28 20:47:49 UTC (rev 48833)
+++ scummvm/branches/branch-1-1-0/engines/drascula/detection.cpp	2010-04-28 20:55:52 UTC (rev 48834)
@@ -50,7 +50,7 @@
 
 	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 @@
 			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 @@
 			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 @@
 			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 @@
 			0,
 			{
 				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
-				{"packet.005", 0, "58caac54b891f5d7f335e710e45e5d29", 16209623},
+				{"packet.005", 1, "58caac54b891f5d7f335e710e45e5d29", 16209623},
 				{NULL, 0, NULL, 0}
 			},
 			Common::IT_ITA,

Modified: scummvm/branches/branch-1-1-0/engines/drascula/drascula.h
===================================================================
--- scummvm/branches/branch-1-1-0/engines/drascula/drascula.h	2010-04-28 20:47:49 UTC (rev 48833)
+++ scummvm/branches/branch-1-1-0/engines/drascula/drascula.h	2010-04-28 20:55:52 UTC (rev 48834)
@@ -258,7 +258,7 @@
 
 	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);
 

Modified: scummvm/branches/branch-1-1-0/engines/drascula/resource.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/drascula/resource.cpp	2010-04-28 20:47:49 UTC (rev 48833)
+++ scummvm/branches/branch-1-1-0/engines/drascula/resource.cpp	2010-04-28 20:55:52 UTC (rev 48834)
@@ -35,8 +35,8 @@
 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.