diff options
author | Strangerke | 2013-09-16 00:05:35 +0200 |
---|---|---|
committer | Strangerke | 2013-09-16 00:05:35 +0200 |
commit | d6be9ed7db8db20aee90bd1c275d5b9d8bb7b9b3 (patch) | |
tree | 0bcc631040ce3477178f6e7db925f6b0caabf1d3 /engines/avalanche/animation.cpp | |
parent | c877ddf4113cbfb4304ba53685713ad207b80069 (diff) | |
download | scummvm-rg350-d6be9ed7db8db20aee90bd1c275d5b9d8bb7b9b3.tar.gz scummvm-rg350-d6be9ed7db8db20aee90bd1c275d5b9d8bb7b9b3.tar.bz2 scummvm-rg350-d6be9ed7db8db20aee90bd1c275d5b9d8bb7b9b3.zip |
AVALANCHE: More index conversion in appearPed
Diffstat (limited to 'engines/avalanche/animation.cpp')
-rw-r--r-- | engines/avalanche/animation.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index e15ecfaab7..2327e5129d 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -722,7 +722,7 @@ void Animation::catacombMove(byte ped) { if ((_vm->_gyro->_geidaFollows) && (ped > 0)) { if (!_sprites[1]._quick) // If we don't already have her... _sprites[1].init(5, true, this); // ...Load Geida. - appearPed(2, geidaPed(ped) - 1); + appearPed(1, geidaPed(ped) - 1); _sprites[1]._callEachStepFl = true; _sprites[1]._eachStepProc = kProcGeida; } @@ -758,7 +758,7 @@ void Animation::callSpecial(uint16 which) { if (!_vm->_gyro->_arrowTriggered) { _vm->_gyro->_arrowTriggered = true; - appearPed(2, 3); // The dart starts at ped 4, and... + appearPed(1, 3); // The dart starts at ped 4, and... _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 @@ -846,13 +846,13 @@ void Animation::callSpecial(uint16 which) { return; switch ((_vm->_gyro->kCatacombMap[_vm->_gyro->_catacombY - 1][_vm->_gyro->_catacombX - 1] & 0xf00) >> 8) { case 0x1: - appearPed(1, 11); + appearPed(0, 11); break; case 0x3: - appearPed(1, 10); + appearPed(0, 10); break; default: - appearPed(1, 3); + appearPed(0, 3); } dawnDelay(); break; @@ -862,7 +862,7 @@ void Animation::callSpecial(uint16 which) { catacombMove(1); if (_vm->_gyro->_room != kRoomCatacombs) return; - appearPed(1, 0); + appearPed(0, 0); dawnDelay(); break; case 12: // _vm->_gyro->special 12: transfer south in catacombs. @@ -871,7 +871,7 @@ void Animation::callSpecial(uint16 which) { catacombMove(2); if (_vm->_gyro->_room != kRoomCatacombs) return; - appearPed(1, 1); + appearPed(0, 1); dawnDelay(); break; case 13: // _vm->_gyro->special 13: transfer west in catacombs. @@ -880,7 +880,7 @@ void Animation::callSpecial(uint16 which) { catacombMove(3); if (_vm->_gyro->_room != kRoomCatacombs) return; - appearPed(1, 2); + appearPed(0, 2); dawnDelay(); break; } @@ -928,7 +928,7 @@ void Animation::openDoor(byte whither, byte ped, byte magicnum) { _vm->_sequence->startToClose(); return; } else { - appearPed(1, 5); + appearPed(0, 5); _sprites[0]._facingDir = kDirRight; // added by TT 12/3/1995 _vm->_sequence->firstShow(8); _vm->_sequence->thenShow(9); @@ -997,10 +997,10 @@ void Animation::changeDirection(byte t, byte dir) { } void Animation::appearPed(byte sprNum, byte pedNum) { - AnimationType *curSpr = &_sprites[sprNum - 1]; + AnimationType *curSpr = &_sprites[sprNum]; PedType *curPed = &_vm->_gyro->_peds[pedNum]; curSpr->appear(curPed->_x - curSpr->_info._xLength / 2, curPed->_y - curSpr->_info._yLength, curPed->_direction); - changeDirection(sprNum - 1, curPed->_direction); + changeDirection(sprNum, curPed->_direction); } // Eachstep procedures: @@ -1287,7 +1287,7 @@ void Animation::hideInCupboard() { } else { _sprites[0]._visible = true; _vm->_gyro->_userMovesAvvy = true; - appearPed(1, 2); // Walk out of the cupboard. + appearPed(0, 2); // Walk out of the cupboard. _vm->_scrolls->displayText("You leave the cupboard. Nice to be out of there!"); _vm->_gyro->_avvysInTheCupboard = false; _vm->_sequence->firstShow(8); @@ -1337,7 +1337,7 @@ void Animation::flipRoom(byte room, byte ped) { _vm->_gyro->_enterCatacombsFromLustiesRoom = true; _vm->_lucerna->enterRoom(room, ped); - appearPed(1, ped - 1); + appearPed(0, ped - 1); _vm->_gyro->_enterCatacombsFromLustiesRoom = false; _oldDirection = _direction; _direction = _sprites[0]._facingDir; |