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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Thu Jul 15 23:10:50 CEST 2010


Revision: 50921
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50921&view=rev
Author:   m_kiewitz
Date:     2010-07-15 21:10:50 +0000 (Thu, 15 Jul 2010)

Log Message:
-----------
SCI: solved lsl1 casino door, lsl6 tram disappearing and qfg1 vga gate issue - i hope this won't cause regressions, but calling the method in collision case is definitely wrong

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/kmovement.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-15 19:39:43 UTC (rev 50920)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-15 21:10:50 UTC (rev 50921)
@@ -517,14 +517,6 @@
 	reg_t object = argv[0];
 
 	g_sci->_gfxCompare->kernelBaseSetter(object);
-
-	// WORKAROUND for a problem in LSL1VGA. This allows the casino door to be opened,
-	// till the actual problem is found
-	if (s->currentRoomNumber() == 300 && g_sci->getGameId() == GID_LSL1) {
-		int top = readSelectorValue(s->_segMan, object, SELECTOR(brTop));
-		writeSelectorValue(s->_segMan, object, SELECTOR(brTop), top + 2);
-	}
-
 	return s->r_acc;
 }
 

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-07-15 19:39:43 UTC (rev 50920)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-07-15 21:10:50 UTC (rev 50921)
@@ -331,7 +331,7 @@
 		writeSelectorValue(segMan, client, SELECTOR(signal), (signal | kSignalHitObstacle));
 
 		debugC(2, kDebugLevelBresen, "Finished mover %04x:%04x by collision", PRINT_REG(mover));
-		completed = 1;
+		// we shall not set completed in this case, sierra sci also doesn't do it
 	}
 
 	if ((getSciVersion() >= SCI_VERSION_1_EGA))


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