aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorathrxx2020-01-04 22:47:14 +0100
committerathrxx2020-01-04 23:09:21 +0100
commita1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3 (patch)
tree14c4ba4912288568cc7d3ddeb9e60fe19f0752e2 /engines
parenta59b8fe294f2285d5f94c769fb05bb39b4d6751b (diff)
downloadscummvm-rg350-a1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3.tar.gz
scummvm-rg350-a1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3.tar.bz2
scummvm-rg350-a1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3.zip
KYRA: (LOK) - fix potion drink animation (bug #11303)
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/engine/kyra_lok.h2
-rw-r--r--engines/kyra/sequence/sequences_lok.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/engines/kyra/engine/kyra_lok.h b/engines/kyra/engine/kyra_lok.h
index 51654865c2..e6a13a3519 100644
--- a/engines/kyra/engine/kyra_lok.h
+++ b/engines/kyra/engine/kyra_lok.h
@@ -170,7 +170,7 @@ protected:
void seq_makeBrandonWisp();
void seq_dispelMagicAnimation();
void seq_fillFlaskWithWater(int item, int type);
- void seq_playDrinkPotionAnim(int item, int unk2, int flags);
+ void seq_playDrinkPotionAnim(int item, int makeFlaskEmpty, int flags);
void seq_brandonToStone();
// -> end fight
diff --git a/engines/kyra/sequence/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp
index ba3d49fafa..0d3b5fc7e4 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -860,7 +860,7 @@ void KyraEngine_LoK::seq_fillFlaskWithWater(int item, int type) {
characterSays(voiceEntries[type], _fullFlask[type], 0, -2);
}
-void KyraEngine_LoK::seq_playDrinkPotionAnim(int item, int unk2, int flags) {
+void KyraEngine_LoK::seq_playDrinkPotionAnim(int item, int makeFlaskEmpty, int flags) {
if (_flags.platform == Common::kPlatformAmiga) {
uint8 r, g, b;
@@ -1003,9 +1003,8 @@ void KyraEngine_LoK::seq_playDrinkPotionAnim(int item, int unk2, int flags) {
delayWithTicks(7);
}
- if (unk2) {
- // XXX
- }
+ if (makeFlaskEmpty)
+ _screen->setPaletteIndex(0xFE, 30, 30, 30);
for (int i = 131; i >= 123; --i) {
_currentCharacter->currentAnimFrame = i;