[Scummvm-cvs-logs] scummvm master -> 263c5924906b2fcb3303850ad919e158cb06e120

[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:
263c592490 ZVISION: Fix bug #6769 (the "Alchemical debacle" video in ZGI)


Commit: 263c5924906b2fcb3303850ad919e158cb06e120
    https://github.com/scummvm/scummvm/commit/263c5924906b2fcb3303850ad919e158cb06e120
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-17T23:38:50+02:00

Commit Message:
ZVISION: Fix bug #6769 (the "Alchemical debacle" video in ZGI)

Changed paths:
    engines/zvision/scripting/actions.cpp



diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index ce6bd31..7581588 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -638,6 +638,13 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 		_mask = -1;
 
 	_fileName = Common::String(fileName);
+
+	// WORKAROUND for bug #6769, location me1g.scr (the "Alchemical debacle"
+	// video in ZGI). We only scale up by 2x, in AnimationEffect::process(),
+	// but the dimensions of the target frame are off by 2 pixels. We fix that
+	// here, so that the video can be scaled.
+	if (_fileName == "me1ga011.avi" && _y2 == 213)
+		_y2 = 215;
 }
 
 ActionPlayAnimation::~ActionPlayAnimation() {