diff options
-rw-r--r-- | engines/avalanche/acci.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/engines/avalanche/acci.cpp b/engines/avalanche/acci.cpp index 5436090dfb..dc794359b3 100644 --- a/engines/avalanche/acci.cpp +++ b/engines/avalanche/acci.cpp @@ -835,24 +835,19 @@ void Acci::exampers() { if (isPersonHere()) { if (_thing != _vm->_gyro->_thinks) _vm->_lucerna->thinkAbout(_person, Gyro::kPerson); + byte newPerson = _person - 149; - switch (_person) { // Special cases - case Gyro::kPeopleDogfood: - if (_vm->_gyro->_wonNim) - _vm->_scrolls->displayScrollChain('Q', 8); // "I'm Not Playing!" - break; - case Gyro::kPeopleDuLustie: - if (_vm->_gyro->_lustieIsAsleep) - _vm->_scrolls->displayScrollChain('Q', 65); // He's asleep. (65! Wow!) - break; - case Gyro::kPeopleAyles: - _vm->_scrolls->displayScrollChain('p', newPerson); - if (!_vm->_gyro->_aylesIsAwake) - _vm->_scrolls->displayScrollChain('Q', 13); - break; - default: + + if ((_person == Gyro::kPeopleDogfood) && _vm->_gyro->_wonNim) + _vm->_scrolls->displayScrollChain('Q', 8); // "I'm Not Playing!" + else if ((_person == Gyro::kPeopleDuLustie) && _vm->_gyro->_lustieIsAsleep) + _vm->_scrolls->displayScrollChain('Q', 65); // He's asleep. (65! Wow!) + else _vm->_scrolls->displayScrollChain('p', newPerson); - } + + if ((_person == Gyro::kPeopleAyles) && !_vm->_gyro->_aylesIsAwake) + _vm->_scrolls->displayScrollChain('Q', 13); + _person = newPerson; } } |