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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Jun 28 18:56:16 CEST 2010


Revision: 50451
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50451&view=rev
Author:   m_kiewitz
Date:     2010-06-28 16:56:15 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
SCI: fix regression of r50422, please no refactoring without proper testing - fixes animations in all sorts of games

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

Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp	2010-06-28 16:35:20 UTC (rev 50450)
+++ scummvm/trunk/engines/sci/graphics/view.cpp	2010-06-28 16:56:15 UTC (rev 50451)
@@ -279,10 +279,8 @@
 }
 
 uint16 GfxView::getCelCount(int16 loopNo) const {
-//	assert(_loopCount);
-//	loopNo = CLIP<int16>(loopNo, 0, _loopCount - 1);
-	if ((loopNo < 0) || (loopNo >= _loopCount))
-		return 0;
+	assert(_loopCount);
+	loopNo = CLIP<int16>(loopNo, 0, _loopCount - 1);
 	return _loop[loopNo].celCount;
 }
 


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