[Scummvm-cvs-logs] scummvm master -> 7c9ab7e4a3e76f6dc4e3a120313ffd9d6d5554c4
dreammaster
dreammaster at scummvm.org
Mon Oct 7 16:43:34 CEST 2013
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:
7c9ab7e4a3 TSAGE: Disable R2R saving when video/cutscene playback is occurring
Commit: 7c9ab7e4a3e76f6dc4e3a120313ffd9d6d5554c4
https://github.com/scummvm/scummvm/commit/7c9ab7e4a3e76f6dc4e3a120313ffd9d6d5554c4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-07T07:43:05-07:00
Commit Message:
TSAGE: Disable R2R saving when video/cutscene playback is occurring
Changed paths:
engines/tsage/ringworld2/ringworld2_logic.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 597ddf3..1e9d622 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -320,8 +320,9 @@ bool Ringworld2Game::canLoadGameStateCurrently() {
* Returns true if it is currently okay to save the game
*/
bool Ringworld2Game::canSaveGameStateCurrently() {
- // Don't allow a game to be saved if a dialog is active
- return g_globals->_gfxManagers.size() == 1;
+ // Don't allow a game to be saved if a dialog is active or if an animation
+ // is playing
+ return g_globals->_gfxManagers.size() == 1 && R2_GLOBALS._animationCtr == 0;
}
/*--------------------------------------------------------------------------*/
@@ -1788,7 +1789,9 @@ AnimationPlayer::~AnimationPlayer() {
void AnimationPlayer::synchronize(Serializer &s) {
EventHandler::synchronize(s);
- warning("TODO AnimationPlayer::synchronize");
+
+ // TODO: Implement saving for animation player state. Currently, I disable saving
+ // when an animation is active, so saving it's state would a "nice to have".
}
void AnimationPlayer::remove() {
More information about the Scummvm-git-logs
mailing list