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

[m_kiewitz at users.sourceforge.net]

Revision: 50180
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50180&view=rev
Author:   m_kiewitz
Date:     2010-06-23 13:42:09 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
SCI: adding some more global scaling code, adding vanishingY and vanishingX as selectors

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/selector.cpp
    scummvm/trunk/engines/sci/engine/static_selectors.cpp
    scummvm/trunk/engines/sci/engine/vm.h
    scummvm/trunk/engines/sci/graphics/animate.cpp

Modified: scummvm/trunk/engines/sci/engine/selector.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.cpp	2010-06-23 12:58:14 UTC (rev 50179)
+++ scummvm/trunk/engines/sci/engine/selector.cpp	2010-06-23 13:42:09 UTC (rev 50180)
@@ -158,6 +158,8 @@
 	FIND_SELECTOR(scaleX);
 	FIND_SELECTOR(scaleY);
 	FIND_SELECTOR(maxScale);
+	FIND_SELECTOR(vanishingX);
+	FIND_SELECTOR(vanishingY);
 	FIND_SELECTOR(iconIndex);
 
 #ifdef ENABLE_SCI32

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-06-23 12:58:14 UTC (rev 50179)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-06-23 13:42:09 UTC (rev 50180)
@@ -108,6 +108,8 @@
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleX", 104 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleY", 105 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,   "maxScale", 106 },
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1, "vanishingX", 107 },
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1, "vanishingY", 108 },
 	{ SCI_VERSION_NONE,             SCI_VERSION_NONE,            0,   0 }
 };
 

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2010-06-23 12:58:14 UTC (rev 50179)
+++ scummvm/trunk/engines/sci/engine/vm.h	2010-06-23 13:42:09 UTC (rev 50180)
@@ -155,6 +155,8 @@
 	Selector scaleSignal; //< Used by kAnimate() for cel scaling (SCI1.1+)
 	Selector scaleX, scaleY;	///< SCI1.1 view scaling
 	Selector maxScale;		///< SCI1.1 view scaling, limit for cel, when using global scaling
+	Selector vanishingX;	///< SCI1.1 view scaling, used by global scaling
+	Selector vanishingY;	///< SCI1.1 view scaling, used by global scaling
 
 	// Used for auto detection purposes
 	Selector overlay;	///< Used to determine if a game is using old gfx functions or not

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-06-23 12:58:14 UTC (rev 50179)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-06-23 13:42:09 UTC (rev 50180)
@@ -233,9 +233,13 @@
 		// Process global scaling, if needed
 		if (listEntry->scaleSignal & kScaleSignalDoScaling) {
 			if (listEntry->scaleSignal & kScaleSignalGlobalScaling) {
+				warning("%lx:%lx", PRINT_REG(curObject));
 				// Global scaling uses global var 2 and some other stuff to calculate scaleX/scaleY
 				int16 maxScale = readSelectorValue(_s->_segMan, curObject, SELECTOR(maxScale));
 				int16 maxCelHeight = (maxScale * view->getHeight(listEntry->loopNo, listEntry->celNo)) >> 7;
+				reg_t globalVar2 = _s->variables[VAR_GLOBAL][1]; // current room
+				int16 vanishingY = readSelectorValue(_s->_segMan, globalVar2, SELECTOR(vanishingY));
+				//warning("vanishingY %d maxScale %d", vanishingY, maxScale);
 				// TODO!
 
 				// and set objects scale selectors


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