aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/animation.cpp
diff options
context:
space:
mode:
authorStrangerke2013-09-18 07:47:52 +0200
committerStrangerke2013-09-18 07:47:52 +0200
commit8be433b96066bbdee815ef719815a2904ef2621b (patch)
tree5ce9f8e75cd3c1878bbb302d390702d90e99cd69 /engines/avalanche/animation.cpp
parent7790b4cc5bbbc895d9ee8f2dc09d259f231b85f0 (diff)
downloadscummvm-rg350-8be433b96066bbdee815ef719815a2904ef2621b.tar.gz
scummvm-rg350-8be433b96066bbdee815ef719815a2904ef2621b.tar.bz2
scummvm-rg350-8be433b96066bbdee815ef719815a2904ef2621b.zip
AVALANCHE: Rename DropDown into Menu, add some access functions
Diffstat (limited to 'engines/avalanche/animation.cpp')
-rw-r--r--engines/avalanche/animation.cpp4
1 files changed, 2 insertions, 2 deletions
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) {