aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-08-11 15:34:55 +0000
committerJohannes Schickel2009-08-11 15:34:55 +0000
commitdfd461e35d9e322f2da5cbf7ace86eb17e8feb7f (patch)
treedf9d876610215faaf741d926ca54ac308c7f7009 /engines/kyra
parent5e10c284e56a9b2e49bcefeef7d8fd4eb574040b (diff)
downloadscummvm-rg350-dfd461e35d9e322f2da5cbf7ace86eb17e8feb7f.tar.gz
scummvm-rg350-dfd461e35d9e322f2da5cbf7ace86eb17e8feb7f.tar.bz2
scummvm-rg350-dfd461e35d9e322f2da5cbf7ace86eb17e8feb7f.zip
- 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
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/sequences_lok.cpp8
-rw-r--r--engines/kyra/staticres.cpp2
2 files changed, 8 insertions, 2 deletions
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) {