[Scummvm-cvs-logs] scummvm master -> 1adcb23d71a1f1ef6c4bc3b98fb474959fd14462

[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:
1adcb23d71 ZVISION: Fix bug #6784 (wrong scaling in the fist control)


Commit: 1adcb23d71a1f1ef6c4bc3b98fb474959fd14462
    https://github.com/scummvm/scummvm/commit/1adcb23d71a1f1ef6c4bc3b98fb474959fd14462
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-02-03T04:16:02+02:00

Commit Message:
ZVISION: Fix bug #6784 (wrong scaling in the fist control)

Changed paths:
    engines/zvision/scripting/controls/fist_control.cpp



diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 4a8e8b1..f79c82d 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -105,7 +105,12 @@ bool FistControl::process(uint32 deltaTimeInMillis) {
 		if (_animation->needsUpdate()) {
 			const Graphics::Surface *frameData = _animation->decodeNextFrame();
 			if (frameData)
-				_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _anmRect);
+				// WORKAROUND: Ignore the target frame dimensions for the finger animations.
+				// The target dimensions specify an area smaller than expected, thus if we
+				// scale the finger videos to fit these dimensions, they are not aligned
+				// correctly. Not scaling these videos yields a result identical to the
+				// original. Fixes bug #6784.
+				_engine->getRenderManager()->blitSurfaceToBkg(*frameData, _anmRect.left, _anmRect.top);
 		}
 	}