diff options
| author | Marisa-Chan | 2014-11-04 10:12:13 +0600 |
|---|---|---|
| committer | Marisa-Chan | 2014-11-04 10:12:13 +0600 |
| commit | be8cf9767470cc8ca9d35539b768817cf74b89c6 (patch) | |
| tree | c3ef373c35ba64ef07415f213a219cf7f240f170 /engines/zvision/scripting | |
| parent | d40caba5b748be38f2b6fe4c70af7eeccedd0ab8 (diff) | |
| download | scummvm-rg350-be8cf9767470cc8ca9d35539b768817cf74b89c6.tar.gz scummvm-rg350-be8cf9767470cc8ca9d35539b768817cf74b89c6.tar.bz2 scummvm-rg350-be8cf9767470cc8ca9d35539b768817cf74b89c6.zip | |
ZVISION: Implement settings functions
Diffstat (limited to 'engines/zvision/scripting')
| -rw-r--r-- | engines/zvision/scripting/script_manager.cpp | 4 | ||||
| -rw-r--r-- | engines/zvision/scripting/script_manager.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp index fea3c2e199..d2165734b4 100644 --- a/engines/zvision/scripting/script_manager.cpp +++ b/engines/zvision/scripting/script_manager.cpp @@ -96,7 +96,7 @@ void ScriptManager::execScope(script_scope &scope) { for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter) (*PuzzleIter)->addedBySetState = 0; - if (scope.proc_count < 2 || getStateValue(76)) { + if (scope.proc_count < 2 || getStateValue(StateKey_ExecScopeStyle)) { for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter) checkPuzzleCriteria(*PuzzleIter, scope.proc_count); } else { @@ -738,6 +738,8 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) { // Place for read prefs _engine->setRenderDelay(10); setStateValue(StateKey_RestoreFlag, 1); + + _engine->loadSettings(); } Location ScriptManager::getCurrentLocation() const { diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h index 219cff9f45..3fcbad5fa4 100644 --- a/engines/zvision/scripting/script_manager.h +++ b/engines/zvision/scripting/script_manager.h @@ -86,6 +86,7 @@ enum StateKey { StateKey_ShowErrorDlg = 73, StateKey_DebugCheats = 74, StateKey_JapanFonts = 75, + StateKey_ExecScopeStyle = 76, StateKey_Brightness = 77, StateKey_EF9_R = 91, StateKey_EF9_G = 92, |