[Scummvm-git-logs] scummvm master -> b639f5389f7da26d113d103dd64faecfa7846696
dreammaster
dreammaster at scummvm.org
Mon Dec 19 03:07:07 CET 2016
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:
b639f5389f TITANIC: Hopefully fix write after tree in CGameManager
Commit: b639f5389f7da26d113d103dd64faecfa7846696
https://github.com/scummvm/scummvm/commit/b639f5389f7da26d113d103dd64faecfa7846696
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-18T21:07:04-05:00
Commit Message:
TITANIC: Hopefully fix write after tree in CGameManager
Changed paths:
engines/titanic/game_manager.cpp
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 9e107c9..fb05705 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -220,6 +220,9 @@ void CGameManager::updateMovies() {
if (movie->_handled)
continue;
+ // Flag the movie to have been handled
+ movie->_handled = true;
+
CMovieEventList eventsList;
if (!movie->handleEvents(eventsList))
movie->removeFromPlayingMovies();
@@ -247,8 +250,6 @@ void CGameManager::updateMovies() {
eventsList.remove(movieEvent);
}
- // Flag the movie as having been handled
- movie->_handled = true;
repeatFlag = true;
break;
}
More information about the Scummvm-git-logs
mailing list