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

[dreammaster]

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:
e4c1305826 CGE: Disable restoring games whilst a cut-scene is active


Commit: e4c13058268df2ad817a2a3b835c53772f3d99dd
    https://github.com/scummvm/scummvm/commit/e4c13058268df2ad817a2a3b835c53772f3d99dd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-11-26T23:43:07-08:00

Commit Message:
CGE: Disable restoring games whilst a cut-scene is active

This is because previously after restoring you could no longer move the Chief.

Changed paths:
    engines/cge/cge.cpp



diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 87654c5..8e74253 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -208,7 +208,8 @@ bool CGEEngine::hasFeature(EngineFeature f) const {
 }
 
 bool CGEEngine::canLoadGameStateCurrently() {
-	return (_startupMode == 0) && _mouse->_active;
+	return (_startupMode == 0) && _mouse->_active &&
+				_commandHandler->idle() && !_hero->_flags._hide;
 }
 
 bool CGEEngine::canSaveGameStateCurrently() {