From dfd461e35d9e322f2da5cbf7ace86eb17e8feb7f Mon Sep 17 00:00:00 2001
From: Johannes Schickel <lordhoto@scummvm.org>
Date: Tue, 11 Aug 2009 15:34:55 +0000
Subject: [PATCH] - Yet another minor difference in seq_winterScroll2 - Fix
 wrong offsets of flasks strings for Kyrandia 1 Amiga in kyra.dat - Increase
 kyra.dat version

svn-id: r43274
---
 dists/engine-data/kyra.dat              | Bin 257348 -> 257348 bytes
 engines/kyra/sequences_lok.cpp          |   8 +++++++-
 engines/kyra/staticres.cpp              |   2 +-
 tools/create_kyradat/amiga.h            |   4 ++--
 tools/create_kyradat/create_kyradat.cpp |   2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index 6bcb6930a323ce43541e9508ec1e1c84267c382e..da57e2ce2a958782cb5ecfde3a12e10db4c0bc74 100644
GIT binary patch
delta 159
zcmX?di~q<i{tfNSOn=fgcQS`1Pk+3T@yO=I>G3>_hMSp7LMnk&#9IkgAXWG&rJd2R
z{aPjC_G^_)!VQdu+h6@;TI~U(r#Uh2Wd_nAZp^+myoL-642(cj2&7r2C%7>yZNJdO
yY@iBMz_^0B!x%_+-DZ9P(olS#c?Yi~NCOiP3mw%u{6->-Pji;aQCYJSVy6IV6*bBL

delta 162
zcmX?di~q<i{tfNSOy%jDJDJ0hCmXMuF<D@p!shAe**uH}o0&^ODuGnQTM1SmRro2T
zozbBES|#K5Yn4pG4U7icU;SiS?E$2xIWg~L2GSvJ%)U0f1`G@gj6hTfq*<mXxG^hj
zztF^NpbAvLxPrOE7)W>BW_|(EP<)?x2d^YZ0}~Jn?KBgcm}M4cHfzg7t+;)q9{_&}
BHd+7x

diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 4589d135722..e1dbd0fca3b 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -555,7 +555,9 @@ void KyraEngine_LoK::seq_winterScroll1() {
 		_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_dispelMagicAnimation() {
 
 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 @@ void KyraEngine_LoK::seq_fillFlaskWithWater(int item, int type) {
 	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);
 }
 
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 2062b9e88ae..e33d24bf593 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -44,7 +44,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 48
+#define RESFILE_VERSION 49
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/tools/create_kyradat/amiga.h b/tools/create_kyradat/amiga.h
index 4dbc404d28e..3b3aa2d5a59 100644
--- a/tools/create_kyradat/amiga.h
+++ b/tools/create_kyradat/amiga.h
@@ -39,8 +39,8 @@ const ExtractEntry kyra1AmigaEng[] = {
 	{ 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 },
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 26fb1a6eff2..780282bab2d 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 48,
+	kKyraDatVersion = 49,
 	kIndexSize = 12
 };