aboutsummaryrefslogtreecommitdiff
path: root/engines/mads
diff options
context:
space:
mode:
authorPaul Gilbert2015-03-07 17:43:15 -0500
committerPaul Gilbert2015-03-07 17:43:15 -0500
commita35aa07c7911010d21bb79209d88b07ddbfd7c30 (patch)
treeed063a42bf76f99f4b99e646b2821b360202aead /engines/mads
parentadc5b5ca2e3b967d51685fec749fc0864b55fa8f (diff)
downloadscummvm-rg350-a35aa07c7911010d21bb79209d88b07ddbfd7c30.tar.gz
scummvm-rg350-a35aa07c7911010d21bb79209d88b07ddbfd7c30.tar.bz2
scummvm-rg350-a35aa07c7911010d21bb79209d88b07ddbfd7c30.zip
MADS: Fix crash looking at fishing rod in restaurant
Diffstat (limited to 'engines/mads')
-rw-r--r--engines/mads/nebular/nebular_scenes5.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index dea5f678c4..b297d2048c 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2427,7 +2427,8 @@ void Scene512::actions() {
_vm->_dialogs->show(51225);
else if (_action.isAction(VERB_LOOK, NOUN_PADLOCK_KEY) && _game._objects.isInRoom(OBJ_PADLOCK_KEY))
_vm->_dialogs->show(51215);
- else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (_scene->_activeAnimation->getCurrentFrame() == 4))
+ else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (!_scene->_activeAnimation ||
+ _scene->_activeAnimation->getCurrentFrame() == 4))
_vm->_dialogs->show(51216);
else if (_action.isAction(VERB_LOOK, NOUN_SHIPS_WHEEL))
_vm->_dialogs->show(51218);