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

[sluicebox]

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:
cc7cbfe626 AGI: Exclude DDP from motion/loop workaround


Commit: cc7cbfe6266ee5d875d9c96d7ecf50c9098f58ca
    https://github.com/scummvm/scummvm/commit/cc7cbfe6266ee5d875d9c96d7ecf50c9098f58ca
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-04T16:13:40-07:00

Commit Message:
AGI: Exclude DDP from motion/loop workaround

Fixes Donald Duck's Playground introduction, bug #14170

Changed paths:
    engines/agi/motion.cpp


diff --git a/engines/agi/motion.cpp b/engines/agi/motion.cpp
index 3eb81908354..bc0069c03ca 100644
--- a/engines/agi/motion.cpp
+++ b/engines/agi/motion.cpp
@@ -70,7 +70,17 @@ void AgiEngine::changePos(ScreenObjEntry *screenObj) {
 // - BC: right at the end when the witches disappear at least on Apple IIgs (room 12, screen object 13, view 84)
 // - KQ1: when grabbing the eagle (room 22).
 // - KQ2: happened somewhere in the game, LordHoto couldn't remember exactly where
+// FIXME: This workaround prevents the DDP introduction from animating the three
+//        jumping ducks while they move from left to right. Bug #14170
+//        For now, this game is excluded from the workaround, but a proper fix
+//        is needed, or at least an explanation for why blocking this behavior
+//        is the right thing to do when at least one game relies on it.
 void AgiEngine::motionActivated(ScreenObjEntry *screenObj) {
+	// Exclude DDP from workaround; see above
+	if (getGameID() == GID_DDP) {
+		return;
+	}
+
 	if (screenObj->flags & fCycling) {
 		// Cycling active too
 		switch (screenObj->cycle) {