[Scummvm-cvs-logs] scummvm master -> fb0f95172a0395cc6d86f26fea5de2c6a780999a

dreammaster dreammaster at scummvm.org
Sun Mar 29 22:23:04 CEST 2015


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:
fb0f95172a MADS: Don't hide sprites bewteen resources in an animation sequence


Commit: fb0f95172a0395cc6d86f26fea5de2c6a780999a
    https://github.com/scummvm/scummvm/commit/fb0f95172a0395cc6d86f26fea5de2c6a780999a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-29T16:21:49-04:00

Commit Message:
MADS: Don't hide sprites bewteen resources in an animation sequence

Changed paths:
    engines/mads/menu_views.cpp



diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 5a0c7ee..319f5b0 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -544,6 +544,7 @@ void AnimationView::doFrame() {
 			scriptDone();
 		} else {
 			scene._frameStartTime = 0;
+			scene._spriteSlots.clear();
 			loadNextResource();
 		}
 	} else if (_currentAnimation->getCurrentFrame() == 1) {
@@ -559,6 +560,10 @@ void AnimationView::doFrame() {
 		++scene._frameStartTime;
 		_currentAnimation->update();
 		_redrawFlag = true;
+
+		if (_currentAnimation->freeFlag())
+			// We don't want the sprites removed after the last animation frame
+			scene._spriteSlots.clear();
 	}
 }
 






More information about the Scummvm-git-logs mailing list