[Scummvm-cvs-logs] SF.net SVN: scummvm: [27897] scummvm/trunk/engines/parallaction/ parallaction.cpp

[Kirben at users.sourceforge.net]

Revision: 27897
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27897&view=rev
Author:   Kirben
Date:     2007-07-04 04:17:37 -0700 (Wed, 04 Jul 2007)

Log Message:
-----------
Fix introduction in Amiga multi-lingual version. Specifically characters for the introduction are only available in disk1

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-07-04 11:09:32 UTC (rev 27896)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-07-04 11:17:37 UTC (rev 27897)
@@ -759,10 +759,13 @@
 		// character for sanity before memory is freed
 		freeCharacter();
 
-		Common::String oldArchive = _disk->selectArchive((_vm->getPlatform() == Common::kPlatformAmiga) ? "disk0" : "disk1");
+		Common::String oldArchive = _disk->selectArchive((_vm->getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0");
 		_vm->_char._ani._cnv = _disk->loadFrames(fullName);
 
 		if (!IS_DUMMY_CHARACTER(name)) {
+			if (_vm->getPlatform() == Common::kPlatformAmiga && (_vm->getFeatures() & GF_LANG_MULT))
+				_disk->selectArchive("disk0");
+
 			_vm->_char._head = _disk->loadHead(baseName);
 			_vm->_char._talk = _disk->loadTalk(baseName);
 			_vm->_char._objs = _disk->loadObjects(baseName);


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