aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2012-09-07 22:27:20 +0200
committerJohannes Schickel2012-09-07 22:38:41 +0200
commit5684475169a371f0b09c9550901279ade10f5275 (patch)
tree7d24e99c920392811cb93c8982001cf81d49effd /engines
parentc06889a289286bcbe49661abfda4316e5290c27c (diff)
downloadscummvm-rg350-5684475169a371f0b09c9550901279ade10f5275.tar.gz
scummvm-rg350-5684475169a371f0b09c9550901279ade10f5275.tar.bz2
scummvm-rg350-5684475169a371f0b09c9550901279ade10f5275.zip
CINE: Workaround disabled menus in FW when loading from launcher/cl.
This works around a regression from 92df76fbb3802bf28819c2684d188251c249cdbb. This should resolve the remaining issues of bug #3565362 "CINE: Savegame loading broken in FW".
Diffstat (limited to 'engines')
-rw-r--r--engines/cine/cine.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index bbe2cd4896..aa7221f733 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -189,7 +189,18 @@ void CineEngine::initialize() {
g_cine->_messageTable.clear();
resetObjectTable();
- disableSystemMenu = 1;
+ if (getGameType() == Cine::GType_OS) {
+ disableSystemMenu = 1;
+ } else {
+ // WORKAROUND: We do not save this variable in FW's savegames.
+ // Initializing this to 1, like we do it in the OS case, will
+ // cause the menu disabled when loading from the launcher or
+ // command line.
+ // A proper fix here would be to save this variable in FW's saves.
+ // Since it seems these are unversioned so far, there would be need
+ // to properly add versioning to them first.
+ disableSystemMenu = 0;
+ }
var8 = 0;