diff options
| author | uruk | 2013-09-15 16:50:12 +0200 |
|---|---|---|
| committer | uruk | 2013-09-15 16:50:12 +0200 |
| commit | d70b856da90ece5cc0d1e210a9992212a5da39a6 (patch) | |
| tree | ae433ad718c00cb7eefa44879cafab7982ef637f /engines/avalanche/timer.cpp | |
| parent | a81b499062bf968b94bfaaa96d84aa893bf87343 (diff) | |
| download | scummvm-rg350-d70b856da90ece5cc0d1e210a9992212a5da39a6.tar.gz scummvm-rg350-d70b856da90ece5cc0d1e210a9992212a5da39a6.tar.bz2 scummvm-rg350-d70b856da90ece5cc0d1e210a9992212a5da39a6.zip | |
AVALANCHE: Rename room number constans. Repair Lucerna::enterRoom().
Diffstat (limited to 'engines/avalanche/timer.cpp')
| -rw-r--r-- | engines/avalanche/timer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp index efe5bf30b7..8cc21fd86a 100644 --- a/engines/avalanche/timer.cpp +++ b/engines/avalanche/timer.cpp @@ -327,7 +327,7 @@ void Timer::hangAround() { AnimationType *avvy = &_vm->_animation->_sprites[0]; avvy->init(7, true, _vm->_animation); // Robin Hood - _vm->_gyro->_whereIs[Gyro::kPeopleRobinHood - 150] = r__robins; + _vm->_gyro->_whereIs[Gyro::kPeopleRobinHood - 150] = kRoomRobins; _vm->_animation->appearPed(1, 2); _vm->_scrolls->displayScrollChain('q', 39); avvy->walkTo(7); @@ -339,7 +339,7 @@ void Timer::hangAround2() { AnimationType *spr = &_vm->_animation->_sprites[1]; spr->_vanishIfStill = false; spr->walkTo(4); - _vm->_gyro->_whereIs[Gyro::kPeopleFriarTuck - 150] = r__robins; + _vm->_gyro->_whereIs[Gyro::kPeopleFriarTuck - 150] = kRoomRobins; _vm->_scrolls->displayScrollChain('q', 41); _vm->_animation->_sprites[0].remove(); spr->remove(); // Get rid of Robin Hood and Friar Tuck. @@ -485,7 +485,7 @@ void Timer::jump() { } if ((_vm->_gyro->_jumpStatus == 10) // You're at the highest point of your jump. - && (_vm->_gyro->_room == r__insidecardiffcastle) + && (_vm->_gyro->_room == kRoomInsideCardiffCastle) && (_vm->_gyro->_arrowInTheDoor == true) && (_vm->_animation->inField(3))) { // Beside the wall // Grab the arrow! |