aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/nebular
diff options
context:
space:
mode:
authorFilippos Karapetis2014-05-20 02:34:32 +0300
committerFilippos Karapetis2014-05-20 02:34:32 +0300
commitd3c5a88bfca98d4664dbbd7729811a94819169bc (patch)
tree85cc8ae16460f2580fab5af20d99a20ed1fb34be /engines/mads/nebular
parent03add3cdd7e737d28596a96cdc7bf7857cc2ee77 (diff)
downloadscummvm-rg350-d3c5a88bfca98d4664dbbd7729811a94819169bc.tar.gz
scummvm-rg350-d3c5a88bfca98d4664dbbd7729811a94819169bc.tar.bz2
scummvm-rg350-d3c5a88bfca98d4664dbbd7729811a94819169bc.zip
MADS: Fix some usages of isAction() with nouns
Diffstat (limited to 'engines/mads/nebular')
-rw-r--r--engines/mads/nebular/game_nebular.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 1afee51c66..51e06d092c 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -586,13 +586,13 @@ void GameNebular::unhandledAction() {
_vm->_dialogs->show(13);
else if (action.isAction(VERB_EAT, NOUN_CHICKEN) && _vm->_game->_objects.isInInventory(OBJ_CHICKEN))
_vm->_dialogs->show(912);
- else if ((action.isAction(VERB_SHOOT) || action.isAction(VERB_HOSE_DOWN)) && action.isAction(NOUN_BLOWGUN)) {
+ else if ((action.isAction(VERB_SHOOT) || action.isAction(VERB_HOSE_DOWN)) && action.isObject(NOUN_BLOWGUN)) {
if ((_scene._currentSceneId >= 104) && (_scene._currentSceneId <= 111))
_vm->_dialogs->show(38);
else if (action.isAction(0x10D))
_vm->_dialogs->show(41);
- else if (action.isAction(NOUN_CHICKEN) || action.isAction(0x185) || action.isAction(0x14D)
- || action.isAction(0x1DD) || action.isAction(0x15F) || action.isAction(NOUN_CAPTIVE_CREATURE)) {
+ else if (action.isObject(NOUN_CHICKEN) || action.isAction(0x185) || action.isAction(0x14D)
+ || action.isAction(0x1DD) || action.isAction(0x15F) || action.isObject(NOUN_CAPTIVE_CREATURE)) {
_vm->_dialogs->show(40);
} else
_vm->_dialogs->show(39);