[Scummvm-cvs-logs] scummvm master -> cb91e1518a3ba88e378d4e90cbe0d8e99ba4e639

dreammaster dreammaster at scummvm.org
Sun Apr 5 05:00:44 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cb91e1518a MADS: Have Rex swim to correct spot when throwing burger or fish


Commit: cb91e1518a3ba88e378d4e90cbe0d8e99ba4e639
    https://github.com/scummvm/scummvm/commit/cb91e1518a3ba88e378d4e90cbe0d8e99ba4e639
Author: unknown (dreammaster at scummvm.org)
Date: 2015-04-04T22:59:43-05:00

Commit Message:
MADS: Have Rex swim to correct spot when throwing burger or fish

Changed paths:
    engines/mads/nebular/nebular_scenes1.cpp



diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index bcc4fb4..c9eda08 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -2589,8 +2589,8 @@ void Scene109::preActions() {
 		_game._player._walkOffScreenSceneId = 108;
 
 	if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE) || _action.isAction(VERB_PUT))
-	&& (_action.isObject(NOUN_SMALL_HOLE) || _action.isObject(NOUN_TUNNEL))
-	&& (_action.isObject(NOUN_DEAD_FISH) || _action.isObject(NOUN_STUFFED_FISH) || _action.isObject(NOUN_BURGER))) {
+			&& (_action.isTarget(NOUN_SMALL_HOLE) || _action.isTarget(NOUN_TUNNEL))
+			&& (_action.isObject(NOUN_DEAD_FISH) || _action.isObject(NOUN_STUFFED_FISH) || _action.isObject(NOUN_BURGER))) {
 		int idx = _game._objects.getIdFromDesc(_action._activeAction._objectNameId);
 		if ((idx >= 0) && _game._objects.isInInventory(idx)) {
 			_game._player._prepareWalkPos = Common::Point(106, 38);






More information about the Scummvm-git-logs mailing list