diff options
| author | Max Horn | 2003-05-21 14:00:19 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-21 14:00:19 +0000 |
| commit | e21604663fa71426bef8fad528626a4ef17d131a (patch) | |
| tree | d6e434e74b556ec677740b74292c84dba947f422 /scumm/scummvm.cpp | |
| parent | 1294eb35c773c195633474dc2fbb8812f4b949a6 (diff) | |
| download | scummvm-rg350-e21604663fa71426bef8fad528626a4ef17d131a.tar.gz scummvm-rg350-e21604663fa71426bef8fad528626a4ef17d131a.tar.bz2 scummvm-rg350-e21604663fa71426bef8fad528626a4ef17d131a.zip | |
added v2 cutscene support (not quite complete; and crashes at some point in maniac because VAR_EGO contains a bogus value); cleanup
svn-id: r7781
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 1767704595..51cf6092db 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1316,6 +1316,7 @@ void Scumm::initRoomSubBlocks() { int ENCD_len = -1; if (_features & GF_AFTER_V2) { _ENCD_offs = READ_LE_UINT16(roomptr + 0x1A); + // TODO: determine v2 entry script length } else if (_features & GF_OLD_BUNDLE) { _ENCD_offs = READ_LE_UINT16(roomptr + 0x1B); // FIXME - the following is a hack which assumes that immediately after @@ -1759,7 +1760,8 @@ void Scumm::processKbd() { return; } - if (_lastKeyHit == VAR(VAR_CUTSCENEEXIT_KEY)) { + if (_lastKeyHit == VAR(VAR_CUTSCENEEXIT_KEY) || + (VAR(VAR_CUTSCENEEXIT_KEY) == 4 && _lastKeyHit == 27)) { if (_insaneState) { _videoFinished = true; } else |