[Scummvm-git-logs] scummvm master -> a1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3

[athrxx]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a59b8fe294 KYRA: (LOK) - fix dispel magic animation (bug #11303)
a1b11d9540 KYRA: (LOK) - fix potion drink animation (bug #11303)


Commit: a59b8fe294f2285d5f94c769fb05bb39b4d6751b
    https://github.com/scummvm/scummvm/commit/a59b8fe294f2285d5f94c769fb05bb39b4d6751b
Author: athrxx (athrxx at scummvm.org)
Date: 2020-01-04T23:09:20+01:00

Commit Message:
KYRA: (LOK) - fix dispel magic animation (bug #11303)

Changed paths:
    engines/kyra/engine/scene_lok.cpp


diff --git a/engines/kyra/engine/scene_lok.cpp b/engines/kyra/engine/scene_lok.cpp
index 51348c5..55ae729 100644
--- a/engines/kyra/engine/scene_lok.cpp
+++ b/engines/kyra/engine/scene_lok.cpp
@@ -174,6 +174,9 @@ void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2,
 
 	initSceneData(facing, unk2, brandonAlive);
 
+	setTextFadeTimerCountdown(-1);
+	_scriptClick.regs[3] = 1;
+
 	_loopFlag2 = 0;
 	_screen->showMouse();
 	if (!brandonAlive)


Commit: a1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3
    https://github.com/scummvm/scummvm/commit/a1b11d9540b1b2e210b3de7b75dd77ecbdf3c8e3
Author: athrxx (athrxx at scummvm.org)
Date: 2020-01-04T23:09:21+01:00

Commit Message:
KYRA: (LOK) - fix potion drink animation (bug #11303)

Changed paths:
    engines/kyra/engine/kyra_lok.h
    engines/kyra/sequence/sequences_lok.cpp


diff --git a/engines/kyra/engine/kyra_lok.h b/engines/kyra/engine/kyra_lok.h
index 5165486..e6a13a3 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 ba3d49f..0d3b5fc 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;