[Scummvm-git-logs] scummvm master -> 829654c2dc576df92991afbff8b67bd8b047e560

[phcoder]

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

Summary:
829654c2dc HADESCH: fix animation cleanup in ferry.


Commit: 829654c2dc576df92991afbff8b67bd8b047e560
    https://github.com/scummvm/scummvm/commit/829654c2dc576df92991afbff8b67bd8b047e560
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T16:44:49+01:00

Commit Message:
HADESCH: fix animation cleanup in ferry.

IT makes the puzzle impossible to complete

Changed paths:
    engines/hadesch/rooms/ferry.cpp


diff --git a/engines/hadesch/rooms/ferry.cpp b/engines/hadesch/rooms/ferry.cpp
index b9ac55f94d..96298c38ff 100644
--- a/engines/hadesch/rooms/ferry.cpp
+++ b/engines/hadesch/rooms/ferry.cpp
@@ -676,14 +676,16 @@ private:
 	void idleAnimShade(int shade, int z, int startFrame, int endFrame) {
 		Common::SharedPtr<VideoRoom> room = g_vm->getVideoRoom();
 		LayerId sl(shadows[_shades[shade].shadowId].image, shade, "shadow");
+		if (_isInAnim[shade])
+			return;
 		_isInAnim[shade] = true;
 		// TODO: play sound multiple times if needed
 		PlayAnimParams params(PlayAnimParams::keepLastFrame().partial(startFrame, endFrame));
 		const char *snd = shadows[_shades[shade].shadowId].animSound;
 		if (snd && snd[0] != 0)
-			room->playAnimWithSound(sl, snd, z, params, EventHandlerWrapper(), getShadowPos(shade));
+			room->playAnimWithSound(sl, snd, z, params, k24018_arg0 + shade, getShadowPos(shade));
 		else
-			room->playAnim(sl, z, params, EventHandlerWrapper(), getShadowPos(shade));
+			room->playAnim(sl, z, params, k24018_arg0 + shade, getShadowPos(shade));
 	}
 
 	void hideCharon() {