[Scummvm-cvs-logs] SF.net SVN: scummvm:[53775] scummvm/trunk/engines/sci/graphics/animate.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 53775
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53775&view=rev
Author:   m_kiewitz
Date:     2010-10-24 21:49:22 +0000 (Sun, 24 Oct 2010)

Log Message:
-----------
SCI: fixing obvious kAddToPic regression

caused by r53068, triggered bug #3092840 (SQ5 genetix lab scaled incorrectly when laying course) - thx to digitall for bisect

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/animate.cpp

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-10-24 20:36:47 UTC (rev 53774)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-10-24 21:49:22 UTC (rev 53775)
@@ -575,7 +575,9 @@
 
 		// Create rect according to coordinates and given cel
 		if (it->scaleSignal & kScaleSignalDoScaling) {
-			applyGlobalScaling(it, view);
+			if (it->scaleSignal & kScaleSignalGlobalScaling) {
+				applyGlobalScaling(it, view);
+			}
 			view->getCelScaledRect(it->loopNo, it->celNo, it->x, it->y, it->z, it->scaleX, it->scaleY, it->celRect);
 			writeSelectorValue(_s->_segMan, curObject, SELECTOR(nsLeft), it->celRect.left);
 			writeSelectorValue(_s->_segMan, curObject, SELECTOR(nsTop), it->celRect.top);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.