aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche
diff options
context:
space:
mode:
Diffstat (limited to 'engines/avalanche')
-rw-r--r--engines/avalanche/acci.cpp10
-rw-r--r--engines/avalanche/animation.cpp12
-rw-r--r--engines/avalanche/lucerna.cpp14
-rw-r--r--engines/avalanche/scrolls.cpp2
-rw-r--r--engines/avalanche/timer.cpp20
5 files changed, 29 insertions, 29 deletions
diff --git a/engines/avalanche/acci.cpp b/engines/avalanche/acci.cpp
index a90e1f0a21..59aaa90da2 100644
--- a/engines/avalanche/acci.cpp
+++ b/engines/avalanche/acci.cpp
@@ -575,7 +575,7 @@ void Acci::storeInterrogation(byte interrogation) {
_vm->_gyro->_spareEvening.clear();
_vm->_gyro->_spareEvening = _vm->_parser->_inputText;
_vm->_scrolls->displayScrollChain('z', 5); // His closing statement...
- _vm->_animation->_sprites[1].walkTo(4); // The end of the drawbridge
+ _vm->_animation->_sprites[1].walkTo(3); // The end of the drawbridge
_vm->_animation->_sprites[1]._vanishIfStill = true; // Then go away!
_vm->_gyro->_magics[1]._operation = Gyro::kMagicNothing;
_vm->_gyro->_cardiffQuestionNum = 5;
@@ -1229,7 +1229,7 @@ void Acci::notInOrder() {
void Acci::goToCauldron() {
_vm->_animation->_sprites[1]._callEachStepFl = false; // Stops Geida_Procs.
_vm->_timer->addTimer(1, Timer::kProcSpludwickGoesToCauldron, Timer::kReasonSpludwickWalk);
- _vm->_animation->_sprites[1].walkTo(2);
+ _vm->_animation->_sprites[1].walkTo(1);
}
/**
@@ -1899,7 +1899,7 @@ void Acci::doThat() {
Avalanche::AnimationType *spr = &_vm->_animation->_sprites[1];
spr->init(1, false, _vm->_animation); // Avaricius
_vm->_animation->appearPed(2, 4);
- spr->walkTo(5);
+ spr->walkTo(4);
spr->_callEachStepFl = true;
spr->_eachStepProc = Animation::kProcBackAndForth;
_vm->_gyro->_avariciusTalk = 14;
@@ -2065,7 +2065,7 @@ void Acci::doThat() {
_vm->_lucerna->refreshObjectList();
_vm->_gyro->_magics[11]._operation = Gyro::kMagicNothing;
_vm->_lucerna->incScore(7);
- _vm->_animation->_sprites[1].walkTo(2);
+ _vm->_animation->_sprites[1].walkTo(1);
_vm->_animation->_sprites[1]._vanishIfStill = true;
_vm->_animation->_sprites[1]._callEachStepFl = false;
_vm->_gyro->_whereIs[7] = 177;
@@ -2191,7 +2191,7 @@ void Acci::doThat() {
if (_vm->_gyro->_sittingInPub)
_vm->_scrolls->displayText("You're already sitting!");
else {
- _vm->_animation->_sprites[0].walkTo(4); // Move Avvy to the place, and sit him down.
+ _vm->_animation->_sprites[0].walkTo(3); // Move Avvy to the place, and sit him down.
_vm->_timer->addTimer(1, Timer::kProcAvvySitDown, Timer::kReasonSittingDown);
}
} else { // Default doodah.
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 5f89ccb224..8ece6b1f40 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -268,7 +268,7 @@ int8 AnimationType::getSign(int16 val) {
}
void AnimationType::walkTo(byte pedNum) {
- PedType *curPed = &_anim->_vm->_gyro->_peds[pedNum - 1]; // Pascal -> C conversion: different array indexes.
+ PedType *curPed = &_anim->_vm->_gyro->_peds[pedNum];
setSpeed(getSign(curPed->_x - _x) * 4, getSign(curPed->_y - _y));
_homingX = curPed->_x - _info._xLength / 2;
@@ -766,7 +766,7 @@ void Animation::callSpecial(uint16 which) {
if (!_vm->_gyro->_arrowTriggered) {
_vm->_gyro->_arrowTriggered = true;
appearPed(2, 4); // The dart starts at ped 4, and...
- _sprites[1].walkTo(5); // flies to ped 5.
+ _sprites[1].walkTo(4); // flies to ped 5 (- 1 for pascal to C conversion).
_sprites[1]._facingDir = kDirUp; // Only face.
// Should call some kind of Eachstep procedure which will deallocate
// the sprite when it hits the wall, and replace it with the chunk
@@ -794,7 +794,7 @@ void Animation::callSpecial(uint16 which) {
_vm->_scrolls->displayScrollChain('q', 36);
_vm->_gyro->_tiedUp = true;
_vm->_gyro->_friarWillTieYouUp = false;
- _sprites[1].walkTo(3);
+ _sprites[1].walkTo(2);
_sprites[1]._vanishIfStill = true;
_sprites[1]._doCheck = true; // One of them must have Check_Me switched on.
_vm->_gyro->_whereIs[Gyro::kPeopleFriarTuck - 150] = 177; // Not here, then.
@@ -831,7 +831,7 @@ void Animation::callSpecial(uint16 which) {
if (!_vm->_gyro->_geidaFollows)
return; // DOESN'T COUNT: no Geida.
_sprites[1]._callEachStepFl = false; // She no longer follows Avvy around.
- _sprites[1].walkTo(4); // She walks to somewhere...
+ _sprites[1].walkTo(3); // She walks to somewhere...
_sprites[0].remove(); // Lose Avvy.
_vm->_gyro->_userMovesAvvy = false;
_vm->_timer->addTimer(40, Timer::kProcRobinHoodAndGeida, Timer::kReasonRobinHoodAndGeida);
@@ -1035,9 +1035,9 @@ void Animation::followAvalotY(byte tripnum) {
void Animation::backAndForth(byte tripnum) {
if (!_sprites[tripnum]._homing) {
if (_sprites[tripnum]._facingDir == kDirRight)
- _sprites[tripnum].walkTo(4);
+ _sprites[tripnum].walkTo(3);
else
- _sprites[tripnum].walkTo(5);
+ _sprites[tripnum].walkTo(4);
}
}
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index ac27ea6cfc..cb9e0c9886 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -463,7 +463,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
if (_vm->_gyro->_roomCount[r__outsideyours] == 1) {
_vm->_animation->appearPed(2, 4); // Start on the right-hand side of the screen.
- spr1->walkTo(5); // Walks up to greet you.
+ spr1->walkTo(4); // Walks up to greet you.
} else {
_vm->_animation->appearPed(2, 5); // Starts where he was before.
spr1->_facingDir = Animation::kDirLeft;
@@ -478,7 +478,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
if (_vm->_gyro->_crapulusWillTell) {
spr1->init(8, false, _vm->_animation);
_vm->_animation->appearPed(2, 2);
- spr1->walkTo(4);
+ spr1->walkTo(3);
_vm->_timer->addTimer(20, Timer::kProcCrapulusSpludOut, Timer::kReasonCrapulusSaysSpludwickOut);
_vm->_gyro->_crapulusWillTell = false;
}
@@ -523,7 +523,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
if (_vm->_gyro->_roomCount[r__brummieroad] == 1) { // First time here...
_vm->_animation->appearPed(2, 2); // He appears on the right of the screen...
- spr1->walkTo(4); // ...and he walks up...
+ spr1->walkTo(3); // ...and he walks up...
} else {
// You've been here before.
_vm->_animation->appearPed(2, 4); // He's standing in your way straight away...
@@ -538,7 +538,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
AnimationType *spr1 = &_vm->_animation->_sprites[1];
spr1->init(4, false, _vm->_animation); // 4 = Cwytalot again
_vm->_animation->appearPed(2, 1);
- spr1->walkTo(2);
+ spr1->walkTo(1);
spr1->_vanishIfStill = true;
_vm->_gyro->_passedCwytalotInHerts = true;
// _vm->_gyro->whereis[#157] = r__Nowhere; // can we fit this in?
@@ -563,7 +563,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
AnimationType *spr1 = &_vm->_animation->_sprites[1];
spr1->init(6, false, _vm->_animation);
_vm->_animation->appearPed(2, 2);
- spr1->walkTo(3);
+ spr1->walkTo(2);
_vm->_timer->addTimer(36, Timer::kProcGetTiedUp, Timer::kReasonGettingTiedUp);
}
}
@@ -588,7 +588,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
case 0 : // You've answered NONE of his questions.
spr1->init(9, false, _vm->_animation);
_vm->_animation->appearPed(2, 2);
- spr1->walkTo(3);
+ spr1->walkTo(2);
_vm->_timer->addTimer(47, Timer::kProcCardiffSurvey, Timer::kReasonCardiffsurvey);
break;
case 5 :
@@ -727,7 +727,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
spr1->init(11, false, _vm->_animation);
if ((_vm->_gyro->_roomCount[r__wisewomans] == 1) && (ped > 0)) {
_vm->_animation->appearPed(2, 2); // Start on the right-hand side of the screen.
- spr1->walkTo(4); // Walks up to greet you.
+ spr1->walkTo(3); // Walks up to greet you.
} else {
_vm->_animation->appearPed(2, 4); // Starts where she was before.
spr1->_facingDir = Animation::kDirLeft;
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index 6e1bb0b492..0390ecaa98 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -1055,7 +1055,7 @@ void Scrolls::talkTo(byte whom) {
AnimationType *spr = &_vm->_animation->_sprites[1];
spr->_vanishIfStill = true;
- spr->walkTo(3); // Walks away.
+ spr->walkTo(2); // Walks away.
_vm->_lucerna->incScore(2);
}
diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp
index efe5bf30b7..2380eb5ba4 100644
--- a/engines/avalanche/timer.cpp
+++ b/engines/avalanche/timer.cpp
@@ -273,7 +273,7 @@ void Timer::bang2() {
void Timer::stairs() {
_vm->_gyro->blip();
- _vm->_animation->_sprites[0].walkTo(4);
+ _vm->_animation->_sprites[0].walkTo(3);
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_gyro->_brummieStairs = 2;
_vm->_gyro->_magics[10]._operation = Gyro::kMagicSpecial;
@@ -316,8 +316,8 @@ void Timer::getTiedUp() {
}
void Timer::getTiedUp2() {
- _vm->_animation->_sprites[0].walkTo(4);
- _vm->_animation->_sprites[1].walkTo(5);
+ _vm->_animation->_sprites[0].walkTo(3);
+ _vm->_animation->_sprites[1].walkTo(4);
_vm->_gyro->_magics[3]._operation = Gyro::kMagicNothing; // No effect when you touch the boundaries.
_vm->_gyro->_friarWillTieYouUp = true;
}
@@ -330,7 +330,7 @@ void Timer::hangAround() {
_vm->_gyro->_whereIs[Gyro::kPeopleRobinHood - 150] = r__robins;
_vm->_animation->appearPed(1, 2);
_vm->_scrolls->displayScrollChain('q', 39);
- avvy->walkTo(7);
+ avvy->walkTo(6);
addTimer(55, kProcHangAround2, kReasonHangingAround);
}
@@ -338,7 +338,7 @@ void Timer::hangAround2() {
_vm->_scrolls->displayScrollChain('q', 40);
AnimationType *spr = &_vm->_animation->_sprites[1];
spr->_vanishIfStill = false;
- spr->walkTo(4);
+ spr->walkTo(3);
_vm->_gyro->_whereIs[Gyro::kPeopleFriarTuck - 150] = r__robins;
_vm->_scrolls->displayScrollChain('q', 41);
_vm->_animation->_sprites[0].remove();
@@ -430,7 +430,7 @@ void Timer::naughtyDuke() { // This is when the Duke comes in and takes your mon
AnimationType *spr = &_vm->_animation->_sprites[1];
spr->init(9, false, _vm->_animation); // Here comes the Duke.
_vm->_animation->appearPed(2, 1); // He starts at the door...
- spr->walkTo(3); // He walks over to you.
+ spr->walkTo(2); // He walks over to you.
// Let's get the door opening.
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
@@ -443,7 +443,7 @@ void Timer::naughtyDuke() { // This is when the Duke comes in and takes your mon
void Timer::naughtyDuke2() {
AnimationType *spr = &_vm->_animation->_sprites[1];
_vm->_scrolls->displayScrollChain('q', 48); // "Ha ha, it worked again!"
- spr->walkTo(1); // Walk to the door.
+ spr->walkTo(0); // Walk to the door.
spr->_vanishIfStill = true; // Then go away!
addTimer(32, kProcNaughtyDuke3, kReasonNaughtyDuke);
}
@@ -587,7 +587,7 @@ void Timer::robinHoodAndGeida() {
AnimationType *avvy = &_vm->_animation->_sprites[0];
avvy->init(7, true, _vm->_animation);
_vm->_animation->appearPed(1, 7);
- avvy->walkTo(6);
+ avvy->walkTo(5);
AnimationType *spr = &_vm->_animation->_sprites[1];
spr->stopWalk();
@@ -601,8 +601,8 @@ void Timer::robinHoodAndGeidaTalk() {
AnimationType *avvy = &_vm->_animation->_sprites[0];
AnimationType *spr = &_vm->_animation->_sprites[1];
- avvy->walkTo(2);
- spr->walkTo(2);
+ avvy->walkTo(1);
+ spr->walkTo(1);
avvy->_vanishIfStill = true;
spr->_vanishIfStill = true;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 03:23:52 +0000