diff options
| author | uruk | 2013-07-29 10:30:57 +0200 |
|---|---|---|
| committer | uruk | 2013-07-29 10:30:57 +0200 |
| commit | e08980c7a4ac8b56f4503205dd8488e91d14fddf (patch) | |
| tree | b5dce4fffbe59b8ea3a7641d7cc1375f656f9533 | |
| parent | c2ac2fdc87e3882e8d75feab3a193991969ec442 (diff) | |
| download | scummvm-rg350-e08980c7a4ac8b56f4503205dd8488e91d14fddf.tar.gz scummvm-rg350-e08980c7a4ac8b56f4503205dd8488e91d14fddf.tar.bz2 scummvm-rg350-e08980c7a4ac8b56f4503205dd8488e91d14fddf.zip | |
AVALANCHE: Repair Acci::person_speaks().
| -rw-r--r-- | engines/avalanche/acci2.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 2d0975f8de..914ca545dc 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1077,21 +1077,20 @@ void Acci::person_speaks() { char cfv; - if ((person == pardon) || (person == '\0')) { + if ((person == pardon) || (person == 0)) if ((_vm->_gyro->him == pardon) || (_vm->_gyro->whereis[_vm->_gyro->him] != _vm->_gyro->dna.room)) person = _vm->_gyro->her; else person = _vm->_gyro->him; - } if (_vm->_gyro->whereis[person] != _vm->_gyro->dna.room) { - _vm->_scrolls->display("\231\4"); /* Avvy _vm->_gyro->himself! */ + _vm->_scrolls->display("\231\4"); // Avvy himself! return; } found = false; /* The person we're looking for's code is in Person. */ - for (fv = 1; fv <= _vm->_trip->numtr; fv++) { + for (fv = 0; fv < _vm->_trip->numtr; fv++) { if (_vm->_trip->tr[fv].quick && ((_vm->_trip->tr[fv].a.accinum + 149) == person)) { _vm->_scrolls->display(Common::String('\23') + char(fv + 48) + '\4'); found = true; @@ -1099,7 +1098,7 @@ void Acci::person_speaks() { } if (!found) { - for (fv = 10; fv <= 25; fv++) { + for (fv = 0; fv < 16; fv++) { _vm->_gyro->quasipeds[fv]; if ((_vm->_gyro->quasipeds[fv].who == person) && (_vm->_gyro->quasipeds[fv].room == _vm->_gyro->dna.room)) { _vm->_scrolls->display(Common::String('\23') + char(fv + 55) + '\4'); |