[Scummvm-cvs-logs] SF.net SVN: scummvm:[43246] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 43246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43246&view=rev
Author:   lordhoto
Date:     2009-08-11 01:24:40 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Finally fixed the string extraction for Kyrandia 1 Amiga. This should make the intro/outro strings work fine again.

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/kyra.dat
    scummvm/trunk/engines/kyra/gui_lok.cpp
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp

Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)

Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp	2009-08-11 01:24:15 UTC (rev 43245)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp	2009-08-11 01:24:40 UTC (rev 43246)
@@ -371,8 +371,11 @@
 		walkspeedGarbageOffset = 0;
 	} else if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
 		// English Amiga version
-		offsetOptions = 8;
+		offset = 23;
+		offsetOn = 23;
+		offsetOptions = 32;
 		walkspeedGarbageOffset = 2;
+		offsetMainMenu = 23;
 	}
 
 	assert(offset + 27 < _vm->_guiStringsSize);

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-08-11 01:24:15 UTC (rev 43245)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-08-11 01:24:40 UTC (rev 43246)
@@ -500,7 +500,7 @@
 			if (g->special == kAmigaVersion) {
 				if (i + 1 >= size)
 					++entries;
-				else if (!data[i+1])
+				else if (!data[i+1] && !(i & 1))
 					continue;
 				else
 					++entries;
@@ -616,7 +616,7 @@
 		// we need to strip some aligment zeros out here
 		int dstPos = 0;
 		for (uint32 i = 0; i < size; ++i) {
-			if (!data[i]) {
+			if (!data[i] && !(i & 1)) {
 				if (i + 1 > size)
 					continue;
 				else if (i + 1 < size && !data[i+1])


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