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

[athrxx at users.sourceforge.net]

Revision: 41327
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41327&view=rev
Author:   athrxx
Date:     2009-06-07 10:34:01 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
LOL: implemented some missing monster animation code

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/sprites_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-06-07 10:13:05 UTC (rev 41326)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-06-07 10:34:01 UTC (rev 41327)
@@ -601,10 +601,6 @@
 	enableSysTimer(1);
 	runLoop();
 
-	delete _tim;
-	_tim = 0;
-
-	// TODO: outro
 	return Common::kNoError;
 }
 

Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp	2009-06-07 10:13:05 UTC (rev 41326)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp	2009-06-07 10:34:01 UTC (rev 41327)
@@ -771,12 +771,20 @@
 
 		break;
 	case 2:
-		///////
-		// TODO
+		return (m->fightCurTick >= 13) ? 13 : m->fightCurTick;
 		break;
 	case 3:
-		///////
-		// TODO
+		switch (m->mode) {
+		case 5:
+			return m->damageReceived ? 5 : 6;
+		case 8:
+			return (m->fightCurTick + 6);
+		case 11:
+			return 5;
+		default:
+			return m->damageReceived ? 5 : m->currentSubFrame;
+		}
+		
 		break;
 	default:
 		break;


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