diff options
author | Strangerke | 2013-09-04 13:06:12 +0200 |
---|---|---|
committer | Strangerke | 2013-09-04 13:06:12 +0200 |
commit | 382046244868c6d08f556ad0ef714b956c9d0389 (patch) | |
tree | 14623e0baca09bc236c717c8a6ea1f1ea77b1625 | |
parent | caeb46f3ce251e10f16cd86bd3d968e7c6c2a642 (diff) | |
download | scummvm-rg350-382046244868c6d08f556ad0ef714b956c9d0389.tar.gz scummvm-rg350-382046244868c6d08f556ad0ef714b956c9d0389.tar.bz2 scummvm-rg350-382046244868c6d08f556ad0ef714b956c9d0389.zip |
AVALANCHE: Fix bugs in winSequence() and doThat()
-rw-r--r-- | engines/avalanche/acci2.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 1f7c86adf1..0a1a047679 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1261,7 +1261,7 @@ void Acci::playHarp() { } void Acci::winSequence() { - _vm->_visa->dixi('pos', 78); + _vm->_visa->dixi('q', 78); _vm->_sequence->first_show(7); _vm->_sequence->then_show(8); _vm->_sequence->then_show(9); @@ -1302,6 +1302,9 @@ void Acci::heyThanks() { _vm->_gyro->dna.obj[_thing - 1] = false; } +/** + * @remarks Originally called 'do_that' + */ void Acci::doThat() { const Common::String booze[] = {"Bitter", "GIED", "Whisky", "Cider", "", "", "", "Mead"}; @@ -1424,7 +1427,7 @@ void Acci::doThat() { break; case Gyro::pibythneth: if (_thing == _vm->_gyro->badge) { - _vm->_visa->dixi('pos', 32); // Thanks! Wow! + _vm->_visa->dixi('q', 32); // Thanks! Wow! _vm->_lucerna->points(3); _vm->_gyro->dna.obj[_vm->_gyro->badge - 1] = false; _vm->_gyro->dna.obj[_vm->_gyro->habit - 1] = true; @@ -1438,7 +1441,7 @@ void Acci::doThat() { if (_vm->_gyro->dna.ayles_is_awake) { if (_thing == _vm->_gyro->pen) { _vm->_gyro->dna.obj[_vm->_gyro->pen - 1] = false; - _vm->_visa->dixi('pos', 54); + _vm->_visa->dixi('q', 54); _vm->_gyro->dna.obj[_vm->_gyro->ink - 1] = true; _vm->_gyro->dna.given_pen_to_ayles = true; _vm->_lucerna->objectlist(); @@ -1470,7 +1473,7 @@ void Acci::doThat() { if (_vm->_gyro->dna.geida_given_potion) winSequence(); else - _vm->_visa->dixi('pos', 77); // That Geida woman! + _vm->_visa->dixi('q', 77); // That Geida woman! break; default: heyThanks(); @@ -1601,7 +1604,7 @@ void Acci::doThat() { } if (!_vm->_gyro->dna.asked_dogfood_about_nim) { - _vm->_visa->dixi('pos', 84); + _vm->_visa->dixi('q', 84); return; } @@ -1696,12 +1699,12 @@ void Acci::doThat() { break; case kVerbCodeMagic: if (_vm->_gyro->dna.avaricius_talk > 0) - _vm->_visa->dixi('pos', 19); + _vm->_visa->dixi('q', 19); else { if ((_vm->_gyro->dna.room == 12) & (_vm->_trip->infield(2))) { // Avaricius appears! - _vm->_visa->dixi('pos', 17); + _vm->_visa->dixi('q', 17); if (_vm->_gyro->whereis[1] == 12) - _vm->_visa->dixi('pos', 18); + _vm->_visa->dixi('q', 18); else { _vm->_trip->tr[1].init(1, false, _vm->_trip); // Avaricius _vm->_trip->apped(2, 4); |