diff options
author | Strangerke | 2013-09-07 20:02:14 +0200 |
---|---|---|
committer | Strangerke | 2013-09-07 20:02:14 +0200 |
commit | 9198b166f7b99b9beedf833e0f2e573420db73fc (patch) | |
tree | bcad05afc31bb52f3da37cb5bf8254a78a7d2693 /engines/avalanche/animation.cpp | |
parent | d96555406ec215f390904d15c729ab6528f8b28f (diff) | |
download | scummvm-rg350-9198b166f7b99b9beedf833e0f2e573420db73fc.tar.gz scummvm-rg350-9198b166f7b99b9beedf833e0f2e573420db73fc.tar.bz2 scummvm-rg350-9198b166f7b99b9beedf833e0f2e573420db73fc.zip |
AVALANCHE: Some more renaming in Animation
Diffstat (limited to 'engines/avalanche/animation.cpp')
-rw-r--r-- | engines/avalanche/animation.cpp | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index 5679e1b715..7b34c39be7 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -170,13 +170,18 @@ void AnimationType::appear(int16 wx, int16 wy, byte wf) { iy = 0; } -bool AnimationType::collision_check() { - for (byte fv = 0; fv < _tr->kSpriteNumbMax; fv++) - if (_tr->tr[fv].quick && (_tr->tr[fv].whichsprite != whichsprite) && - ((_x + _info._xLength) > _tr->tr[fv]._x) && - (_x < (_tr->tr[fv]._x + _tr->tr[fv]._info._xLength)) && - (_tr->tr[fv]._y == _y)) +/** + * Check collision + * @remarks Originally called 'collision_check' + */ +bool AnimationType::checkCollision() { + for (byte i = 0; i < _tr->kSpriteNumbMax; i++) { + if (_tr->tr[i].quick && (_tr->tr[i].whichsprite != whichsprite) && + ((_x + _info._xLength) > _tr->tr[i]._x) && + (_x < (_tr->tr[i]._x + _tr->tr[i]._info._xLength)) && + (_tr->tr[i]._y == _y)) return true; + } return false; } @@ -207,7 +212,7 @@ void AnimationType::walk() { } if (check_me) { - if (collision_check()) { + if (checkCollision()) { bounce(); return; } @@ -833,7 +838,7 @@ void Animation::catamove(byte ped) { tr[1].init(5, true, this); // ...Load Geida. apped(2, geida_ped(ped)); tr[1].call_eachstep = true; - tr[1].eachstep = procgeida_procs; + tr[1].eachstep = kProcGeida; } } @@ -878,7 +883,7 @@ void Animation::call_special(uint16 which) { // OK! tr[1].call_eachstep = true; - tr[1].eachstep = procarrow_procs; + tr[1].eachstep = kProcArrow; } break; case 4: // This is the ghost room link. @@ -1373,7 +1378,11 @@ void Animation::call_andexors() { } } -void Animation::trippancy_link() { +/** + * Animation links + * @remarks Originally called 'trippancy_link' + */ +void Animation::animLink() { byte fv; if (_vm->_gyro->_dropdownActive | _vm->_gyro->_onToolbar | _vm->_gyro->_seeScroll) @@ -1388,23 +1397,23 @@ void Animation::trippancy_link() { for (fv = 0; fv < kSpriteNumbMax; fv++) { if (tr[fv].quick && tr[fv].call_eachstep) { switch (tr[fv].eachstep) { - case procfollow_avvy_y : + case kProcFollowAvvyY : follow_avvy_y(fv); break; - case procback_and_forth : + case kProcBackAndForth : back_and_forth(fv); break; - case procface_avvy : + case kProcFaceAvvy : face_avvy(fv); break; - case procarrow_procs : + case kProcArrow : arrow_procs(fv); break; // PROCSpludwick_procs : spludwick_procs(fv); - case procgrab_avvy : + case kProcGrabAvvy : grab_avvy(fv); break; - case procgeida_procs : + case kProcGeida : geida_procs(fv); break; } |