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

[lordhoto at users.sourceforge.net]

Revision: 43274
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43274&view=rev
Author:   lordhoto
Date:     2009-08-11 15:34:55 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
- Yet another minor difference in seq_winterScroll2
- Fix wrong offsets of flasks strings for Kyrandia 1 Amiga in kyra.dat
- Increase kyra.dat version

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/kyra.dat
    scummvm/trunk/engines/kyra/sequences_lok.cpp
    scummvm/trunk/engines/kyra/staticres.cpp
    scummvm/trunk/tools/create_kyradat/amiga.h
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp

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

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 15:34:28 UTC (rev 43273)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 15:34:55 UTC (rev 43274)
@@ -555,7 +555,9 @@
 		_animator->sprites()[0].active = 0;
 		_sprites->_anims[1].play = true;
 		_animator->sprites()[1].active = 1;
-		setGameFlag(0xA2);
+
+		if (_flags.platform != Common::kPlatformAmiga)
+			setGameFlag(0xA2);
 	}
 
 	for (int i = midpoint; i < 123 + numFrames; ++i) {
@@ -781,6 +783,7 @@
 
 void KyraEngine_LoK::seq_fillFlaskWithWater(int item, int type) {
 	int newItem = -1;
+
 	static const uint8 flaskTable1[] = { 0x46, 0x48, 0x4A, 0x4C };
 	static const uint8 flaskTable2[] = { 0x47, 0x49, 0x4B, 0x4D };
 
@@ -802,12 +805,15 @@
 	setMouseItem(newItem);
 	_screen->showMouse();
 	_itemInHand = newItem;
+
 	assert(_fullFlask);
 	assert(type < _fullFlask_Size && type >= 0);
+
 	static const uint16 voiceEntries[] = {
 		0x1F40, 0x1F41, 0x1F42, 0x1F45
 	};
 	assert(type < ARRAYSIZE(voiceEntries));
+
 	characterSays(voiceEntries[type], _fullFlask[type], 0, -2);
 }
 

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-08-11 15:34:28 UTC (rev 43273)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-08-11 15:34:55 UTC (rev 43274)
@@ -44,7 +44,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 48
+#define RESFILE_VERSION 49
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {

Modified: scummvm/trunk/tools/create_kyradat/amiga.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/amiga.h	2009-08-11 15:34:28 UTC (rev 43273)
+++ scummvm/trunk/tools/create_kyradat/amiga.h	2009-08-11 15:34:55 UTC (rev 43274)
@@ -39,8 +39,8 @@
 	{ kBranStoneShapes, 0x00039C32, 0x00039CA0 },
 	{ kWispJewelStrings, 0x00004A54, 0x00004AAA },
 	{ kMagicJewelStrings, 0x00004AAA, 0x00004ABE },
-	{ kFlaskFullString, 0x00017B04, 0x00017B9E },
-	{ kFullFlaskString, 0x00017B9E, 0x00017BBA },
+	{ kFlaskFullString, 0x00017B9E, 0x00017BBA },
+	{ kFullFlaskString, 0x00017B04, 0x00017B9E },
 	{ kOutroReunionSeq, 0x00030A4A, 0x00030F94 },
 	{ kOutroHomeString, 0x0000C6FA, 0x0000C6FF },
 	{ kVeryCleverString, 0x0000B322, 0x0000B354 },

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-08-11 15:34:28 UTC (rev 43273)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-08-11 15:34:55 UTC (rev 43274)
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 48,
+	kKyraDatVersion = 49,
 	kIndexSize = 12
 };
 


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