[Scummvm-cvs-logs] SF.net SVN: scummvm:[43313] scummvm/branches/gsoc2009-draci/engines/draci/ animation.cpp

dkasak13 at users.sourceforge.net dkasak13 at users.sourceforge.net
Wed Aug 12 09:37:09 CEST 2009


Revision: 43313
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43313&view=rev
Author:   dkasak13
Date:     2009-08-12 07:37:08 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Stopped returning from Animation::nextFrame() early even if the animation has only one frame because such animations may need to have callbacks called too. Fixes intro freeze during mother's lecture.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/animation.cpp

Modified: scummvm/branches/gsoc2009-draci/engines/draci/animation.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/animation.cpp	2009-08-12 07:34:31 UTC (rev 43312)
+++ scummvm/branches/gsoc2009-draci/engines/draci/animation.cpp	2009-08-12 07:37:08 UTC (rev 43313)
@@ -85,8 +85,8 @@
 
 void Animation::nextFrame(bool force) {
 
-	// If there's only one or no frames, or if the animation is not playing, return
-	if (getFrameCount() < 2 || !_playing)
+	// If there are no frames or if the animation is not playing, return
+	if (getFrameCount() == 0 || !_playing)
 		return;
 
 	Drawable *frame = _frames[_currentFrame];


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