[Scummvm-cvs-logs] scummvm master -> fd6731c9b6f3977b2d03d1e6db2522e0769d8f33

bluegr bluegr at gmail.com
Fri Dec 12 21:55:00 CET 2014


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:
fd6731c9b6 ZVISION: Only scale down animations to fit their frame, not up


Commit: fd6731c9b6f3977b2d03d1e6db2522e0769d8f33
    https://github.com/scummvm/scummvm/commit/fd6731c9b6f3977b2d03d1e6db2522e0769d8f33
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-12T22:53:52+02:00

Commit Message:
ZVISION: Only scale down animations to fit their frame, not up

This fixes the animations in two locations in Zork: Nemesis (the armor
visor in location cz1e, and the planet in location aa10).

Changed paths:
    engines/zvision/scripting/sidefx/animation_node.cpp



diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 549aacb..74e4cad 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -117,7 +117,11 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 					dsth = nod->pos.height();
 				}
 
-				if (frame->w != dstw || frame->h != dsth) {
+				// We only scale down the animation to fit its frame, not up, otherwise we
+				// end up with distorted animations - e.g. the armor visor in location cz1e
+				// in Nemesis (one of the armors inside Irondune), or the planet in location
+				// aa10 in Nemesis (Juperon, outside the asylum).
+				if (frame->w > dstw || frame->h > dsth) {
 					if (nod->_scaled)
 						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
 							delete nod->_scaled;






More information about the Scummvm-git-logs mailing list