diff options
| author | Max Horn | 2002-12-26 23:05:19 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-26 23:05:19 +0000 |
| commit | c05a308fad833ec57101a9ec704db0f9b5533fd8 (patch) | |
| tree | 3ede598960c29179f58022fd949d4b0bd0bfd162 /scumm | |
| parent | c44512ff718e8e20b535892f8de806b1394cd4b7 (diff) | |
| download | scummvm-rg350-c05a308fad833ec57101a9ec704db0f9b5533fd8.tar.gz scummvm-rg350-c05a308fad833ec57101a9ec704db0f9b5533fd8.tar.bz2 scummvm-rg350-c05a308fad833ec57101a9ec704db0f9b5533fd8.zip | |
doSentence only takes three params in V8
svn-id: r6179
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v6.cpp | 3 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index dda2cec7da..c44477cf01 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1138,7 +1138,8 @@ void Scumm_v6::o6_doSentence() int a, b, c; a = pop(); - pop(); //dummy pop + if (!(_features & GF_AFTER_V8)) + pop(); // dummy pop b = pop(); c = pop(); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index a5dbe7f053..0a65947d2c 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1168,13 +1168,13 @@ void Scumm::processKbd() if (_imuse) _imuse->set_music_volume (vol); } else if (_lastKeyHit == '-') { // - text speed down - _defaultTalkDelay+=5; + _defaultTalkDelay += 5; if (_defaultTalkDelay > 90) _defaultTalkDelay = 90; _vars[VAR_CHARINC] = _defaultTalkDelay / 20; } else if (_lastKeyHit == '+') { // + text speed up - _defaultTalkDelay-=5; + _defaultTalkDelay -= 5; if (_defaultTalkDelay < 5) _defaultTalkDelay = 5; |