diff options
| -rw-r--r-- | dists/engine-data/kyra.dat | bin | 257348 -> 257348 bytes | |||
| -rw-r--r-- | engines/kyra/sequences_lok.cpp | 8 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 2 | ||||
| -rw-r--r-- | tools/create_kyradat/amiga.h | 4 | ||||
| -rw-r--r-- | 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 Binary files differindex 6bcb6930a3..da57e2ce2a 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 4589d13572..e1dbd0fca3 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 2062b9e88a..e33d24bf59 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 4dbc404d28..3b3aa2d5a5 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 26fb1a6eff..780282bab2 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 }; |