[Scummvm-cvs-logs] SF.net SVN: scummvm: [32189] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 32189
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32189&view=rev
Author:   lordhoto
Date:     2008-05-19 14:47:42 -0700 (Mon, 19 May 2008)

Log Message:
-----------
- Fixed out of bounds bug in KyraEngine_MR::updateItemAnimations
- Clean up in KyraEngine_HoF::updateItemAnimations

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator_hof.cpp
    scummvm/trunk/engines/kyra/animator_mr.cpp

Modified: scummvm/trunk/engines/kyra/animator_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_hof.cpp	2008-05-19 21:32:37 UTC (rev 32188)
+++ scummvm/trunk/engines/kyra/animator_hof.cpp	2008-05-19 21:47:42 UTC (rev 32189)
@@ -128,7 +128,7 @@
 
 	const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem];
 	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];	
-	_nextAnimItem = ++_nextAnimItem % 14;
+	_nextAnimItem = ++_nextAnimItem % _itemAnimDataSize;
 
 	uint32 ctime = _system->getMillis();
 	if (ctime < a->nextFrame)

Modified: scummvm/trunk/engines/kyra/animator_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_mr.cpp	2008-05-19 21:32:37 UTC (rev 32188)
+++ scummvm/trunk/engines/kyra/animator_mr.cpp	2008-05-19 21:47:42 UTC (rev 32189)
@@ -205,7 +205,7 @@
 
 	const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem];
 	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];
-	_nextAnimItem = ++_nextAnimItem % 11;
+	_nextAnimItem = ++_nextAnimItem % 10;
 
 	uint32 ctime = _system->getMillis();
 	if (ctime < a->nextFrame)


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