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

[athrxx at users.sourceforge.net]

Revision: 32144
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32144&view=rev
Author:   athrxx
Date:     2008-05-16 13:26:57 -0700 (Fri, 16 May 2008)

Log Message:
-----------
cleanup

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-16 19:20:28 UTC (rev 32143)
+++ scummvm/trunk/engines/kyra/animator_hof.cpp	2008-05-16 20:26:57 UTC (rev 32144)
@@ -127,12 +127,8 @@
 		return;	
 
 	const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem];
-	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];
-	
-	if (++_nextAnimItem == 14) {
-		_nextAnimItem = 0;
-		return;
-	}
+	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];	
+	_nextAnimItem = ++_nextAnimItem % 14;
 
 	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-16 19:20:28 UTC (rev 32143)
+++ scummvm/trunk/engines/kyra/animator_mr.cpp	2008-05-16 20:26:57 UTC (rev 32144)
@@ -205,12 +205,8 @@
 
 	const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem];
 	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];
+	_nextAnimItem = ++_nextAnimItem % 11;
 
-	if (++_nextAnimItem == 11) {
-		_nextAnimItem = 0;
-		return;
-	}
-
 	uint32 ctime = _system->getMillis();
 	if (ctime < a->nextFrame)
 		return;


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