diff options
| author | Filippos Karapetis | 2013-01-13 16:29:25 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2013-01-13 16:29:25 +0200 |
| commit | bbec4acff5ab800445095d826f7a391f46aaf6a8 (patch) | |
| tree | 6c6d71fcd0eeec7eafbccf9da8dbf90aafc9306a /engines/toltecs/toltecs.cpp | |
| parent | 981bc20337d0a1d083473ba384398ef8777443e3 (diff) | |
| download | scummvm-rg350-bbec4acff5ab800445095d826f7a391f46aaf6a8.tar.gz scummvm-rg350-bbec4acff5ab800445095d826f7a391f46aaf6a8.tar.bz2 scummvm-rg350-bbec4acff5ab800445095d826f7a391f46aaf6a8.zip | |
TOLTECS: Fix bug #3600166 - "TOLTECS: Parrot speech cuts off Fenimore's in Cemetery"
Diffstat (limited to 'engines/toltecs/toltecs.cpp')
| -rw-r--r-- | engines/toltecs/toltecs.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index 02a0e338a0..1a399dacc0 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -495,6 +495,11 @@ void ToltecsEngine::updateCamera() { void ToltecsEngine::talk(int16 slotIndex, int16 slotOffset) { byte *scanData = _script->getSlotData(slotIndex) + slotOffset; + // If there's another talk text at the requested slot and it's still + // active, don't overwrite it. Fixes bug #3600166. + if (_screen->isTalkTextActive(slotIndex)) + return; + while (*scanData < 0xF0) { if (*scanData == 0x19) { scanData++; |