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

[bluegr]

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:
e8fb4b4898 BURIED: Fix door opening transition to Da Vinci study (bug 12885)


Commit: e8fb4b489856d78aff6ddd8573a16bc0bdfbbec5
    https://github.com/scummvm/scummvm/commit/e8fb4b489856d78aff6ddd8573a16bc0bdfbbec5
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-09-16T11:36:25+03:00

Commit Message:
BURIED: Fix door opening transition to Da Vinci study (bug 12885)

Integrated upstreams code for playing the correct animation when opening
the door to Da Vinci's study. I take no credit for this, since the
complete solution was just handed to me and I could never have figured
it out on my own.

Changed paths:
    engines/buried/environ/da_vinci.cpp


diff --git a/engines/buried/environ/da_vinci.cpp b/engines/buried/environ/da_vinci.cpp
index 32bf47bec6..0054055d8c 100644
--- a/engines/buried/environ/da_vinci.cpp
+++ b/engines/buried/environ/da_vinci.cpp
@@ -829,15 +829,18 @@ int CodexTowerOutsideDoor::mouseUp(Window *viewWindow, const Common::Point &poin
 			DestinationScene destData;
 			destData.destinationScene = _staticData.location;
 			destData.destinationScene.depth = 1;
-			destData.transitionType = TRANSITION_VIDEO;
-			destData.transitionData = 2;
-			destData.transitionStartFrame = -1;
-			destData.transitionLength = -1;
+			destData.transitionType = TRANSITION_WALK;
+			destData.transitionData = 11;
+			destData.transitionStartFrame = 196;
+			destData.transitionLength = 20;
 
 			// Play a different video otherwise
 			if (((SceneViewWindow *)viewWindow)->getGlobalFlags().dsCTViewedAgent3 == 0) {
 				destData.transitionType = TRANSITION_VIDEO;
 				destData.transitionData = 1;
+				destData.transitionStartFrame = -1;
+				destData.transitionLength = -1;
+				((SceneViewWindow *)viewWindow)->getGlobalFlags().dsCTViewedAgent3 = 1;
 			}
 
 			((SceneViewWindow *)viewWindow)->moveToDestination(destData);