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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jan 15 22:32:31 CET 2010


Revision: 47313
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47313&view=rev
Author:   m_kiewitz
Date:     2010-01-15 21:32:18 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
SCI: added enum for ScaleSignal

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

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-01-15 21:26:02 UTC (rev 47312)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-01-15 21:32:18 UTC (rev 47313)
@@ -161,8 +161,13 @@
 		if (getSciVersion() >= SCI_VERSION_1_1) {
 			// Cel scaling
 			listEntry->scaleSignal = GET_SEL32V(_s->_segMan, curObject, scaleSignal);
-			listEntry->scaleX = GET_SEL32V(_s->_segMan, curObject, scaleX);
-			listEntry->scaleY = GET_SEL32V(_s->_segMan, curObject, scaleY);
+			if (listEntry->scaleSignal & kScaleSignalDoScaling) {
+				listEntry->scaleX = GET_SEL32V(_s->_segMan, curObject, scaleX);
+				listEntry->scaleY = GET_SEL32V(_s->_segMan, curObject, scaleY);
+			} else {
+				listEntry->scaleX = 128;
+				listEntry->scaleY = 128;
+			}
 		} else {
 			listEntry->scaleSignal = 0;
 			listEntry->scaleX = 128;

Modified: scummvm/trunk/engines/sci/graphics/animate.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.h	2010-01-15 21:26:02 UTC (rev 47312)
+++ scummvm/trunk/engines/sci/graphics/animate.h	2010-01-15 21:32:18 UTC (rev 47313)
@@ -50,6 +50,12 @@
 	kSignalDisposeMe     = 0x8000
 };
 
+enum ViewScaleSignals {
+	kScaleSignalDoScaling	= 0x0001, // enables scaling when drawing that cel (involves scaleX and scaleY)
+	kScaleSignalUnknown1	= 0x0002, // seems to do something with a globalvar
+	kScaleSignalUnknown2	= 0x0004 // really unknown
+};
+
 class Gfx;
 class Screen;
 class SciPalette;


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




More information about the Scummvm-git-logs mailing list