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

[m_kiewitz at users.sourceforge.net]

Revision: 52004
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52004&view=rev
Author:   m_kiewitz
Date:     2010-08-11 21:16:45 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
SCI: revert r51969

broke laura bow 1, need to figure out whats exactly wrong

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

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-11 21:07:07 UTC (rev 52003)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-11 21:16:45 UTC (rev 52004)
@@ -204,15 +204,13 @@
 		// Get the corresponding view
 		view = _cache->getView(it->viewId);
 
-		uint16 viewLoopCount = view->getLoopCount();
 		// adjust loop and cel, if any of those is invalid
-		if (it->loopNo >= viewLoopCount) {
-			it->loopNo = viewLoopCount - 1;
+		if (it->loopNo >= view->getLoopCount()) {
+			it->loopNo = 0;
 			writeSelectorValue(_s->_segMan, curObject, SELECTOR(loop), it->loopNo);
 		}
-		uint16 viewCelCount = view->getCelCount(it->loopNo);
-		if (it->celNo >= viewCelCount) {
-			it->celNo = viewCelCount - 1;
+		if (it->celNo >= view->getCelCount(it->loopNo)) {
+			it->celNo = 0;
 			writeSelectorValue(_s->_segMan, curObject, SELECTOR(cel), it->celNo);
 		}
 

Modified: scummvm/trunk/engines/sci/graphics/animate.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.h	2010-08-11 21:07:07 UTC (rev 52003)
+++ scummvm/trunk/engines/sci/graphics/animate.h	2010-08-11 21:16:45 UTC (rev 52004)
@@ -60,8 +60,8 @@
 	int16 givenOrderNo;
 	reg_t object;
 	GuiResourceId viewId;
-	uint16 loopNo;
-	uint16 celNo;
+	int16 loopNo;
+	int16 celNo;
 	int16 paletteNo;
 	int16 x, y, z;
 	int16 priority;


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