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

[m_kiewitz at users.sourceforge.net]

Revision: 50931
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50931&view=rev
Author:   m_kiewitz
Date:     2010-07-16 05:46:07 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
SCI: kDoBresen - save last position of client inside mover - fixes lsl6 tram still shaking while gotten stopped due ego

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

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-07-16 04:45:47 UTC (rev 50930)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-07-16 05:46:07 UTC (rev 50931)
@@ -267,6 +267,12 @@
 	bdelta = (int16)readSelectorValue(segMan, mover, SELECTOR(b_incr));
 	axis = (int16)readSelectorValue(segMan, mover, SELECTOR(b_xAxis));
 
+	if (SELECTOR(xLast) != -1) {
+		// Introduced SCI1MIDDLE (it seems) - save last position into mover
+		writeSelectorValue(segMan, mover, SELECTOR(xLast), x);
+		writeSelectorValue(segMan, mover, SELECTOR(yLast), y);
+	}
+
 	//printf("movecnt %d, move speed %d\n", movcnt, max_movcnt);
 
 	if (g_sci->_features->handleMoveCount()) {

Modified: scummvm/trunk/engines/sci/engine/selector.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.cpp	2010-07-16 04:45:47 UTC (rev 50930)
+++ scummvm/trunk/engines/sci/engine/selector.cpp	2010-07-16 05:46:07 UTC (rev 50931)
@@ -104,6 +104,8 @@
 	FIND_SELECTOR2(b_incr, "b-incr");
 	FIND_SELECTOR(xStep);
 	FIND_SELECTOR(yStep);
+	FIND_SELECTOR(xLast);
+	FIND_SELECTOR(yLast);
 	FIND_SELECTOR(moveSpeed);
 	FIND_SELECTOR(canBeHere);	// cantBeHere
 	FIND_SELECTOR(heading);

Modified: scummvm/trunk/engines/sci/engine/selector.h
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.h	2010-07-16 04:45:47 UTC (rev 50930)
+++ scummvm/trunk/engines/sci/engine/selector.h	2010-07-16 05:46:07 UTC (rev 50931)
@@ -69,6 +69,7 @@
 	Selector dx, dy; ///< Deltas
 	Selector b_movCnt, b_i1, b_i2, b_di, b_xAxis, b_incr; ///< Various Bresenham vars
 	Selector xStep, yStep; ///< BR adjustments
+	Selector xLast, yLast; ///< BR last position of client
 	Selector moveSpeed; ///< Used for DoBresen
 	Selector canBeHere; ///< Funcselector: Checks for movement validity in SCI0
 	Selector heading, mover; ///< Used in DoAvoider


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