diff options
| author | Strangerke | 2013-09-15 15:17:37 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-15 15:17:37 +0200 |
| commit | cccc126d156f4f64445eb0eef43affe3a99a5080 (patch) | |
| tree | 3b4669ac3faff097d44296e140340ac0fc5cf148 | |
| parent | a81b499062bf968b94bfaaa96d84aa893bf87343 (diff) | |
| download | scummvm-rg350-cccc126d156f4f64445eb0eef43affe3a99a5080.tar.gz scummvm-rg350-cccc126d156f4f64445eb0eef43affe3a99a5080.tar.bz2 scummvm-rg350-cccc126d156f4f64445eb0eef43affe3a99a5080.zip | |
AVALANCHE: Convert index use from Pascal to C in Bearing()
| -rw-r--r-- | engines/avalanche/celer.cpp | 13 | ||||
| -rw-r--r-- | engines/avalanche/lucerna.cpp | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/avalanche/celer.cpp b/engines/avalanche/celer.cpp index f8b2604ee0..94ef574199 100644 --- a/engines/avalanche/celer.cpp +++ b/engines/avalanche/celer.cpp @@ -118,11 +118,12 @@ void Celer::updateBackgroundSprites() { if ((_vm->_gyro->_roomTime % 200 >= 0) && (_vm->_gyro->_roomTime % 200 <= 178)) { // Normally. byte direction = 0; - if (((_vm->_lucerna->bearing(2) >= 1) && (_vm->_lucerna->bearing(2) <= 90)) || ((_vm->_lucerna->bearing(2) >= 358) && (_vm->_lucerna->bearing(2) <= 360))) + uint16 angle = _vm->_lucerna->bearing(1); + if (((angle >= 1) && (angle <= 90)) || ((angle >= 358) && (angle <= 360))) direction = 3; - else if ((_vm->_lucerna->bearing(2) >= 293) && (_vm->_lucerna->bearing(2) <= 357)) + else if ((angle >= 293) && (angle <= 357)) direction = 2; - else if ((_vm->_lucerna->bearing(2) >= 271) && (_vm->_lucerna->bearing(2) <= 292)) + else if ((angle >= 271) && (angle <= 292)) direction = 4; if (direction != _vm->_gyro->_npcFacing) { // Dogfood. @@ -152,7 +153,7 @@ void Celer::updateBackgroundSprites() { case r__lustiesroom: if (!(_vm->_gyro->_lustieIsAsleep)) { byte direction = 0; - uint16 angle = _vm->_lucerna->bearing(2); + uint16 angle = _vm->_lucerna->bearing(1); if ((_vm->_gyro->_roomTime % 45) > 42) direction = 4; // du Lustie blinks. // Bearing of Avvy from du Lustie. @@ -196,7 +197,7 @@ void Celer::updateBackgroundSprites() { case r__nottspub: { // Bearing of Avvy from Port. byte direction = 0; - uint16 angle = _vm->_lucerna->bearing(5); + uint16 angle = _vm->_lucerna->bearing(4); if ((angle <= 45) || ((angle >= 315) && (angle <= 360))) direction = 2; // Middle. else if ((angle >= 45) && (angle <= 180)) @@ -228,7 +229,7 @@ void Celer::updateBackgroundSprites() { // Bearing of Avvy from Duck. byte direction = 0; - uint16 angle = _vm->_lucerna->bearing(2); + uint16 angle = _vm->_lucerna->bearing(1); if ((angle <= 45) || ((angle >= 315) && (angle <= 360))) direction = 4; // Middle. else if ((angle >= 45) && (angle <= 180)) diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp index e848442c5c..ac27ea6cfc 100644 --- a/engines/avalanche/lucerna.cpp +++ b/engines/avalanche/lucerna.cpp @@ -1217,7 +1217,7 @@ void Lucerna::majorRedraw() { uint16 Lucerna::bearing(byte whichPed) { static const double rad2deg = 180 / 3.14; // Pi AnimationType *avvy = &_vm->_animation->_sprites[0]; - PedType *curPed = &_vm->_gyro->_peds[whichPed - 1]; // Different array indexes in Pascal and C. + PedType *curPed = &_vm->_gyro->_peds[whichPed]; if (avvy->_x == curPed->_x) return 0; |