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

fuzzie fuzzie at fuzzie.org
Sat Aug 9 23:14:35 CEST 2014


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

Summary:
94f8359896 COMPOSER: Make sure V1 scripts are run before redrawing.
c3f3b623d6 COMPOSER: Remove sprites when stopping V1 scripts (bug #6091).


Commit: 94f83598968de6e7fb2b16e7eece19d6336552af
    https://github.com/scummvm/scummvm/commit/94f83598968de6e7fb2b16e7eece19d6336552af
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2014-08-09T23:11:02+02:00

Commit Message:
COMPOSER: Make sure V1 scripts are run before redrawing.

Changed paths:
    engines/composer/composer.cpp



diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 471a290..f070338 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -135,7 +135,7 @@ Common::Error ComposerEngine::run() {
 			else
 				loadLibrary(_pendingPageChanges[i]._pageId);
 
-			lastDrawTime = _system->getMillis();
+			lastDrawTime = 0;
 		}
 		_pendingPageChanges.clear();
 
@@ -168,9 +168,10 @@ Common::Error ComposerEngine::run() {
 			else
 				lastDrawTime += frameTime;
 
+			tickOldScripts();
+
 			redraw();
 
-			tickOldScripts();
 			processAnimFrame();
 		} else if (_needsUpdate) {
 			redraw();


Commit: c3f3b623d6492e172db959b310ca4bcfd84f280e
    https://github.com/scummvm/scummvm/commit/c3f3b623d6492e172db959b310ca4bcfd84f280e
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2014-08-09T23:11:47+02:00

Commit Message:
COMPOSER: Remove sprites when stopping V1 scripts (bug #6091).

Changed paths:
    engines/composer/scripting.cpp



diff --git a/engines/composer/scripting.cpp b/engines/composer/scripting.cpp
index 94ca2c1..cd78202 100644
--- a/engines/composer/scripting.cpp
+++ b/engines/composer/scripting.cpp
@@ -746,6 +746,7 @@ void ComposerEngine::stopOldScript(uint16 id) {
 
 	for (Common::List<OldScript *>::iterator i = _oldScripts.begin(); i != _oldScripts.end(); i++) {
 		if ((*i)->_id == id) {
+			removeSprite(0, id);
 			delete *i;
 			i = _oldScripts.reverse_erase(i);
 		}






More information about the Scummvm-git-logs mailing list