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

[thebluegr at users.sourceforge.net]

Revision: 49639
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49639&view=rev
Author:   thebluegr
Date:     2010-06-13 22:01:10 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Disabled two cases of findObjectByName() in SCI0 early games

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-06-13 21:43:13 UTC (rev 49638)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-06-13 22:01:10 UTC (rev 49639)
@@ -201,7 +201,7 @@
 		// stopGroop object, which points to ego, to the new ego object. If this is not
 		// done, ego's movement will not be updated properly, so the result is
 		// unpredictable (for example in LSL5, Patti spins around instead of walking).
-		if (index == 0 && type == VAR_GLOBAL) {	// global 0 is ego
+		if (index == 0 && type == VAR_GLOBAL && getSciVersion() > SCI_VERSION_0_EARLY) {	// global 0 is ego
 			reg_t stopGroopPos = segMan->findObjectByName("stopGroop");
 			if (!stopGroopPos.isNull()) {	// does the game have a stopGroop object?
 				// Find the "client" member variable of the stopGroop object, and update it

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-06-13 21:43:13 UTC (rev 49638)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-06-13 22:01:10 UTC (rev 49639)
@@ -63,9 +63,11 @@
 	if (getSciVersion() <= SCI_VERSION_01)
 		_ignoreFastCast = true;
 	// Also if fastCast object exists at gamestartup, we can assume that the interpreter doesnt do kAnimate aborts
-	//  (found in larry 1)
-	if (!_s->_segMan->findObjectByName("fastCast").isNull())
-		_ignoreFastCast = true;
+	//  (found in Larry 1)
+	if (getSciVersion() > SCI_VERSION_0_EARLY) {
+		if (!_s->_segMan->findObjectByName("fastCast").isNull())
+			_ignoreFastCast = true;
+	}
 }
 
 void GfxAnimate::disposeLastCast() {


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