[Scummvm-cvs-logs] scummvm master -> 3a205467a9ec12e899e3e4bfa34186d7a8f4c6bd

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3a205467a9 MADS: Fix for switching between animations in AnimView sequence


Commit: 3a205467a9ec12e899e3e4bfa34186d7a8f4c6bd
    https://github.com/scummvm/scummvm/commit/3a205467a9ec12e899e3e4bfa34186d7a8f4c6bd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-10-08T22:47:14-04:00

Commit Message:
MADS: Fix for switching between animations in AnimView sequence

Changed paths:
    engines/mads/nebular/menu_nebular.cpp



diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 6db9179..1fbf96d 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -858,8 +858,7 @@ bool AnimationView::onEvent(Common::Event &event) {
 void AnimationView::doFrame() {
 	Scene &scene = _vm->_game->_scene;
 	
-	// TODO: Or when current animation is finished
-	if (_resourceIndex == -1) {
+	if (_resourceIndex == -1 || _currentAnimation->freeFlag()) {
 		if (++_resourceIndex == (int)_resources.size()) {
 			scriptDone();
 		} else {