[Scummvm-cvs-logs] scummvm master -> 1860c2107adb4d08ce6d5a360b47bf5c19392713

[wjp]

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:
1860c2107a SCI: Add notes


Commit: 1860c2107adb4d08ce6d5a360b47bf5c19392713
    https://github.com/scummvm/scummvm/commit/1860c2107adb4d08ce6d5a360b47bf5c19392713
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-10-19T23:44:45+02:00

Commit Message:
SCI: Add notes

Changed paths:
    engines/sci/engine/kfile.cpp
    engines/sci/engine/savegame.cpp



diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index cb8ba7a..c56eb09 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -922,6 +922,8 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) {
 				// path is never followed in these two cases (restoring game from the menu, or restoring a game
 				// from the ScummVM launcher). Thus, we perform the calls to enable the menus ourselves here.
 				// These two are needed when restoring from the launcher
+				// FIXME: The original interpreter saves and restores the menu state, so these attributes
+				// are automatically reset there. We may want to do the same.
 				g_sci->_gfxMenu->kernelSetAttribute(257 >> 8, 257 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Sierra -> About Jones
 				g_sci->_gfxMenu->kernelSetAttribute(258 >> 8, 258 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Sierra -> Help
 				// The rest are normally enabled from room1::init
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index cdcdcc4..9decc4c 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -844,6 +844,8 @@ bool gamestate_save(EngineState *s, Common::WriteStream *fh, const Common::Strin
 	if (voc)
 		voc->saveLoadWithSerializer(ser);
 
+	// TODO: SSCI (at least JonesCD, presumably more) also stores the Menu state
+
 	return true;
 }