diff options
| author | Thomas Fach-Pedersen | 2016-10-24 19:24:32 +0200 |
|---|---|---|
| committer | Thomas Fach-Pedersen | 2016-10-24 19:40:18 +0200 |
| commit | e0a04a3185d92b0979babdf23a3eaf49c5d815a8 (patch) | |
| tree | 2357a306f08a0b6e104092f20cd91ac675f4fda5 /engines/bladerunner/actor.cpp | |
| parent | 4b6e0f0e7d68e61b5870431d3aded6f7950f2282 (diff) | |
| download | scummvm-rg350-e0a04a3185d92b0979babdf23a3eaf49c5d815a8.tar.gz scummvm-rg350-e0a04a3185d92b0979babdf23a3eaf49c5d815a8.tar.bz2 scummvm-rg350-e0a04a3185d92b0979babdf23a3eaf49c5d815a8.zip | |
BLADERUNNER: Fix out-of-bounds access in voiceover actor (multiple CIDs)
CID 1364219
CID 1364223
Diffstat (limited to 'engines/bladerunner/actor.cpp')
| -rw-r--r-- | engines/bladerunner/actor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp index c778a6dee0..9a8892cf6c 100644 --- a/engines/bladerunner/actor.cpp +++ b/engines/bladerunner/actor.cpp @@ -868,7 +868,7 @@ void Actor::speechPlay(int sentenceId, bool voiceOver) { sprintf(name, "%02d-%04d.AUD", _id, sentenceId); //TODO somewhere here should be also language code int balance; - if (voiceOver || _id == 99) { + if (voiceOver || _id == VOICEOVER_ACTOR) { balance = 0; } else { // Vector3 pos = _vm->_view->_frameViewMatrix * _position; @@ -910,7 +910,7 @@ void Actor::copyClues(int actorId) { for (int i = 0; i < (int)_vm->_gameInfo->getClueCount(); i++) { if (hasClue(i) && !_clues->isFlag4(i) && !otherActor->hasClue(i)) { int fromActorId = _id; - if (_id == 99) + if (_id == VOICEOVER_ACTOR) fromActorId = _clues->getFromActorId(i); otherActor->acquireClue(i, 0, fromActorId); } |