diff options
| -rw-r--r-- | engines/avalanche/acci2.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/gyro2.cpp | 8 | ||||
| -rw-r--r-- | engines/avalanche/gyro2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/trip6.cpp | 1 |
5 files changed, 10 insertions, 11 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index d586519cb1..731d297b84 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1839,11 +1839,11 @@ void Acci::do_that() { break; case _vm->_gyro->payles: if (!_vm->_gyro->dna.ayles_is_awake) - _vm->_scrolls->display("You can't seem to wake _vm->_gyro->him by yourself."); + _vm->_scrolls->display("You can't seem to wake him by yourself."); break; case _vm->_gyro->pjacques: - _vm->_scrolls->display(Common::String("Brother Jacques, Brother Jacques, are you asleep?\231\2") + - "Hmmm... that doesn't seem to do any good..."); + _vm->_scrolls->display(Common::String("Brother Jacques, Brother Jacques, are you asleep?") + _vm->_scrolls->kControlRegister + '1' + + _vm->_scrolls->kControlSpeechBubble + "Hmmm... that doesn't seem to do any good..."); break; default: _vm->_scrolls->display("It's difficult to awaken people who aren't asleep...!"); diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index 82daf2e17b..a7305c9aa3 100644 --- a/engines/avalanche/gyro2.cpp +++ b/engines/avalanche/gyro2.cpp @@ -401,12 +401,10 @@ bool Gyro::pennycheck(uint16 howmuchby) { // There'll may be problems with calling these functions becouse of the conversion of the arrays!!! // Keep an eye open! Common::String Gyro::getname(byte whose) { - Common::String getname_result; - if (whose < 17) - getname_result = lads[whose]; + if (whose < 175) + return lads[whose - 150]; else - getname_result = lasses[whose-17]; - return getname_result; + return lasses[whose - 175]; } // Keep an eye open! ^ diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h index aa5a0fdc85..cafaabb8b8 100644 --- a/engines/avalanche/gyro2.h +++ b/engines/avalanche/gyro2.h @@ -570,7 +570,7 @@ public: bool keyboardclick; /* Is a keyboard click noise wanted? */ - char him, her, it; + byte him, her, it; int32 roomtime; /* Set to 0 when you enter a room, added to in every loop.*/ bool after_the_scroll; diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index 3f86eb5ed8..1b4d83556b 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -281,9 +281,9 @@ void Lucerna::find_people(byte room) { for (byte fv = 1; fv < 29; fv++) // There'll may be problems with this. if (_vm->_gyro->whereis[fv] == room) { if (fv < 25) // And this. See definition of whereis[]. - _vm->_gyro->him = fv; + _vm->_gyro->him = fv + 150; else - _vm->_gyro->her = fv; + _vm->_gyro->her = fv + 150; } } diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index 12294ba946..afbe13be1a 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -284,6 +284,7 @@ int8 triptype::sgn(int16 x) { } void triptype::walkto(byte pednum) { + pednum--; // Pascal -> C conversion: different array indexes. speed(sgn(_tr->_vm->_gyro->peds[pednum].x - x) * 4, sgn(_tr->_vm->_gyro->peds[pednum].y - y)); hx = _tr->_vm->_gyro->peds[pednum].x - _info.xl / 2; hy = _tr->_vm->_gyro->peds[pednum].y - _info.yl; |