diff options
| author | Norbert Lange | 2009-07-17 21:23:54 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-17 21:23:54 +0000 |
| commit | bb64bf008d03e01760a468d0df8cacb164725d41 (patch) | |
| tree | d73710df5b07f3fa1ca30e719c1c1f58ebe0b107 /engines/scumm/scumm.cpp | |
| parent | 81ac29ebca30c352646a5b21de512087cb96a672 (diff) | |
| parent | 53756ef1d022a959b24c041e18f55eef34e60dd3 (diff) | |
| download | scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.tar.gz scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.tar.bz2 scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.zip | |
merge with trunk
svn-id: r42574
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 6716fda3fd..b02c3b3346 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -443,7 +443,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) VAR_SCRIPT_CYCLE = 0xFF; VAR_NUM_GLOBAL_OBJS = 0xFF; - VAR_KEY_STATE = 0xFF; // Use g_scumm from error() ONLY g_scumm = this; @@ -685,6 +684,7 @@ ScummEngine_v6::ScummEngine_v6(OSystem *syst, const DetectorResult &dr) _curVerbSlot = 0; _forcedWaitForMessage = false; + _skipVideo = false; VAR_VIDEONAME = 0xFF; VAR_RANDOM_NR = 0xFF; @@ -786,6 +786,7 @@ ScummEngine_v80he::ScummEngine_v80he(OSystem *syst, const DetectorResult &dr) VAR_PLATFORM = 0xFF; VAR_PLATFORM_VERSION = 0xFF; VAR_CURRENT_CHARSET = 0xFF; + VAR_KEY_STATE = 0xFF; VAR_COLOR_DEPTH = 0xFF; } |