diff options
| author | Strangerke | 2013-10-04 17:15:24 +0200 |
|---|---|---|
| committer | Strangerke | 2013-10-04 17:15:24 +0200 |
| commit | 9b9462bcee4031f4222ba4649f8c8434a1bd9111 (patch) | |
| tree | e7c75596b4e9c9c77a697d9c3ea5de65c2772a00 | |
| parent | 49960992caaa7e67ae75463de74b30932254c0f8 (diff) | |
| download | scummvm-rg350-9b9462bcee4031f4222ba4649f8c8434a1bd9111.tar.gz scummvm-rg350-9b9462bcee4031f4222ba4649f8c8434a1bd9111.tar.bz2 scummvm-rg350-9b9462bcee4031f4222ba4649f8c8434a1bd9111.zip | |
AVALANCHE: Check | occurrence as pointed by LordHoto
| -rw-r--r-- | engines/avalanche/animation.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/avalot.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index f274fc79d6..08dffd5b5f 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -1137,7 +1137,7 @@ void Animation::drawSprites() { * @remarks Originally called 'trippancy_link' */ void Animation::animLink() { - if (_vm->_menu->isActive() | _vm->_seeScroll) + if (_vm->_menu->isActive() || _vm->_seeScroll) return; for (int16 i = 0; i < kSpriteNumbMax; i++) { if (_sprites[i]._quick && _sprites[i]._visible) diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index 8cc11917f7..cff944602c 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -40,7 +40,7 @@ namespace Avalanche { // Art gallery at 2,1; notice about this at 2,2. const int32 AvalancheEngine::kCatacombMap[8][8] = { // Geida's room - // 1 2 3 | 4 5 6 7 8 + // 1 2 3 4 5 6 7 8 {0x204, 0x200, 0xd0f0, 0xf0ff, 0xff, 0xd20f, 0xd200, 0x200}, {0x50f1, 0x20ff, 0x2ff, 0xff, 0xe0ff, 0x20ff, 0x200f, 0x7210}, {0xe3f0, 0xe10f, 0x72f0, 0xff, 0xe0ff, 0xff, 0xff, 0x800f}, |