[Scummvm-cvs-logs] SF.net SVN: scummvm: [27357] scummvm/trunk/engines/saga/animation.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Jun 11 14:14:07 CEST 2007
Revision: 27357
http://scummvm.svn.sourceforge.net/scummvm/?rev=27357&view=rev
Author: thebluegr
Date: 2007-06-11 05:14:06 -0700 (Mon, 11 Jun 2007)
Log Message:
-----------
The waiting thread will no longer wait forever for some videos to finish in IHNM
Modified Paths:
--------------
scummvm/trunk/engines/saga/animation.cpp
Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp 2007-06-11 12:12:59 UTC (rev 27356)
+++ scummvm/trunk/engines/saga/animation.cpp 2007-06-11 12:14:06 UTC (rev 27357)
@@ -387,8 +387,14 @@
}
if (anim->currentFrame > anim->maxFrame) {
- anim->currentFrame = anim->loopFrame;
+ if (_vm->_interface->getMode() == kPanelVideo) {
+ // Videos never loop
+ _vm->_frameCount++;
+ anim->currentFrame++;
+ } else
+ anim->currentFrame = anim->loopFrame;
+
if (anim->state == ANIM_STOPPING || anim->currentFrame == -1) {
anim->state = ANIM_PAUSE;
}
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