[Scummvm-cvs-logs] scummvm master -> 6d8134f7518a2c368a55cfc49ba0a625a9744645

dreammaster dreammaster at scummvm.org
Sun Mar 15 21:23:06 CET 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:
6d8134f751 MADS: Revert fix for sprites disappearing on last frame of cutscenes


Commit: 6d8134f7518a2c368a55cfc49ba0a625a9744645
    https://github.com/scummvm/scummvm/commit/6d8134f7518a2c368a55cfc49ba0a625a9744645
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-15T16:20:01-04:00

Commit Message:
MADS: Revert fix for sprites disappearing on last frame of cutscenes

The fix that kept the sprites on-screen for the last frame before scene
changes in the intro/ending sequences was also causing crashes in-game,
where the animation is getting freed before the scene update to remove
the sprites was done, so it couldn't get the areas of the screen to
refresh

Changed paths:
    engines/mads/animation.cpp



diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index b484916..cf02e7b 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -436,6 +436,9 @@ void Animation::update() {
 	if (_vm->_game->_scene._frameStartTime < _nextFrameTimer)
 		return;
 
+	// Erase any active sprites
+	eraseSprites();
+
 	// Validate the current frame
 	if (_currentFrame >= (int)_miscEntries.size()) {
 		// Is the animation allowed to be repeated?
@@ -448,8 +451,6 @@ void Animation::update() {
 		}
 	}
 
-	eraseSprites();
-
 	// Handle executing any sound command for this frame
 	AnimMiscEntry &misc = _miscEntries[_currentFrame];
 	if (misc._soundId)






More information about the Scummvm-git-logs mailing list