diff options
author | Matthew Hoops | 2012-09-07 18:59:50 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-09-07 19:03:01 -0400 |
commit | 8259d3cd9e68288dc622302fe84a924d6f94b00c (patch) | |
tree | f8ee4018c0be86e1f73c20dd81243199eccadb80 /engines/cine/cine.cpp | |
parent | c50d40b7bf0914c5a1a5da221cee146ab4aa2f63 (diff) | |
parent | f08978a0750e6a6a5dbea1f8fe5d80267049f8c8 (diff) | |
download | scummvm-rg350-8259d3cd9e68288dc622302fe84a924d6f94b00c.tar.gz scummvm-rg350-8259d3cd9e68288dc622302fe84a924d6f94b00c.tar.bz2 scummvm-rg350-8259d3cd9e68288dc622302fe84a924d6f94b00c.zip |
Merge remote branch 'upstream/master' into qtmidi
Diffstat (limited to 'engines/cine/cine.cpp')
-rw-r--r-- | engines/cine/cine.cpp | 13 |
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; |