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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jan 15 22:26:08 CET 2010


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

Log Message:
-----------
SCI: changed scalesignal to scaleSignal - selector works now :)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.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/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-01-15 21:13:33 UTC (rev 47311)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-01-15 21:26:02 UTC (rev 47312)
@@ -235,7 +235,7 @@
 	FIND_SELECTOR(overlay);
 	FIND_SELECTOR(setCursor);
 	FIND_SELECTOR(topString);
-	FIND_SELECTOR(scalesignal);
+	FIND_SELECTOR(scaleSignal);
 	FIND_SELECTOR(scaleX);
 	FIND_SELECTOR(scaleY);
 

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-01-15 21:13:33 UTC (rev 47311)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-01-15 21:26:02 UTC (rev 47312)
@@ -71,7 +71,7 @@
 	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1, "cantBeHere",  57 },
 	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1,  "topString", 101 },
 	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1,      "flags", 102 },
-	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,"scalesignal", 103 },
+	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,"scaleSignal", 103 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleX", 104 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleY", 105 },
 	{ SCI_VERSION_NONE,             SCI_VERSION_NONE,            0,   0 }

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2010-01-15 21:13:33 UTC (rev 47311)
+++ scummvm/trunk/engines/sci/engine/vm.h	2010-01-15 21:26:02 UTC (rev 47312)
@@ -190,7 +190,7 @@
 	Selector syncTime;
 
 	// SCI1.1 specific selectors
-	Selector scalesignal; // < Used by Animate() for cel scaling (SCI1.1+)
+	Selector scaleSignal; // < Used by Animate() for cel scaling (SCI1.1+)
 	Selector scaleX, scaleY;	///< SCI1.1 view scaling
 
 	// Used for auto detection purposes

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-01-15 21:13:33 UTC (rev 47311)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-01-15 21:26:02 UTC (rev 47312)
@@ -160,7 +160,7 @@
 		listEntry->signal = GET_SEL32V(_s->_segMan, curObject, signal);
 		if (getSciVersion() >= SCI_VERSION_1_1) {
 			// Cel scaling
-			listEntry->scaleSignal = GET_SEL32V(_s->_segMan, curObject, scalesignal);
+			listEntry->scaleSignal = GET_SEL32V(_s->_segMan, curObject, scaleSignal);
 			listEntry->scaleX = GET_SEL32V(_s->_segMan, curObject, scaleX);
 			listEntry->scaleY = GET_SEL32V(_s->_segMan, curObject, scaleY);
 		} else {


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