From 8be433b96066bbdee815ef719815a2904ef2621b Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 18 Sep 2013 07:47:52 +0200 Subject: AVALANCHE: Rename DropDown into Menu, add some access functions --- engines/avalanche/animation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/avalanche/animation.cpp') diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index edcc53cdcf..e3634e0677 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -1226,7 +1226,7 @@ void Animation::drawSprites() { * @remarks Originally called 'trippancy_link' */ void Animation::animLink() { - if (_vm->_gyro->_dropdownActive | _vm->_gyro->_onToolbar | _vm->_gyro->_seeScroll) + if (_vm->_menu->isActive() | _vm->_gyro->_onToolbar | _vm->_gyro->_seeScroll) return; for (int16 i = 0; i < kSpriteNumbMax; i++) { if (_sprites[i]._quick && _sprites[i]._visible) @@ -1377,7 +1377,7 @@ void Animation::handleMoveKey(const Common::Event &event) { if (!_vm->_gyro->_userMovesAvvy) return; - if (_vm->_dropdown->_activeMenuItem._activeNow) + if (_vm->_menu->_activeMenuItem._activeNow) _vm->_parser->tryDropdown(); else { switch (event.kbd.keycode) { -- cgit v1.2.3