aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-09-04 12:51:29 +0200
committerStrangerke2013-09-04 12:51:29 +0200
commitcaeb46f3ce251e10f16cd86bd3d968e7c6c2a642 (patch)
tree367b2cfd2a66b5cb21d0f6642a91f7de54de30cc
parentc781727a03c0a7db10cf61944b54066199dbe838 (diff)
downloadscummvm-rg350-caeb46f3ce251e10f16cd86bd3d968e7c6c2a642.tar.gz
scummvm-rg350-caeb46f3ce251e10f16cd86bd3d968e7c6c2a642.tar.bz2
scummvm-rg350-caeb46f3ce251e10f16cd86bd3d968e7c6c2a642.zip
AVALANCHE: Fix bugs in getProc() and giveGeidaTheLute(), add doxygen comment
-rw-r--r--engines/avalanche/acci2.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 9da26a80f4..1f7c86adf1 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -1190,7 +1190,7 @@ void Acci::getProc(char thing) {
} else
_vm->_scrolls->display(Common::String("I can't see ") + _vm->_gyro->get_better(thing) + " in the box.");
} else
- _vm->_visa->dixi('pos', 57);
+ _vm->_visa->dixi('q', 57);
break;
case r__insidecardiffcastle:
switch (thing) {
@@ -1208,15 +1208,15 @@ void Acci::getProc(char thing) {
_vm->_scrolls->display("Taken.");
}
} else if (_vm->_gyro->dna.standing_on_dais)
- _vm->_visa->dixi('pos', 53);
+ _vm->_visa->dixi('q', 53);
else
- _vm->_visa->dixi('pos', 51);
+ _vm->_visa->dixi('q', 51);
break;
case Gyro::bolt:
- _vm->_visa->dixi('pos', 52);
+ _vm->_visa->dixi('q', 52);
break;
default:
- _vm->_visa->dixi('pos', 57);
+ _vm->_visa->dixi('q', 57);
}
break;
case r__robins:
@@ -1229,13 +1229,17 @@ void Acci::getProc(char thing) {
_vm->_lucerna->objectlist();
_vm->_lucerna->points(3);
} else
- _vm->_visa->dixi('pos', 57);
+ _vm->_visa->dixi('q', 57);
break;
default:
- _vm->_visa->dixi('pos', 57);
+ _vm->_visa->dixi('q', 57);
}
}
+/**
+ * Give the lute to Geida
+ * @remarks Originally called 'give_Geida_the_lute'
+ */
void Acci::giveGeidaTheLute() {
if (_vm->_gyro->dna.room != r__lustiesroom) {
_vm->_scrolls->display(Common::String("Not yet. Try later!") + _vm->_scrolls->kControlRegister + '2' + _vm->_scrolls->kControlSpeechBubble);
@@ -1243,7 +1247,7 @@ void Acci::giveGeidaTheLute() {
}
_vm->_gyro->dna.obj[_vm->_gyro->lute - 1] = false;
_vm->_lucerna->objectlist();
- _vm->_visa->dixi('pos', 64); // She plays it.
+ _vm->_visa->dixi('q', 64); // She plays it.
_vm->_timeout->set_up_timer(1, _vm->_timeout->procgive_lute_to_geida, _vm->_timeout->reason_geida_sings);
_vm->_enid->back_to_bootstrap(4);