[Scummvm-cvs-logs] scummvm master -> 381ebe7816e023c29396f3661e0bf6ed2d9e9702

[dreammaster]

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

Summary:
6e0762f3be MADS: Stop showing picture dialogs for items before you've picked them up
381ebe7816 MADS: Fix for picking up first bone in scene 202


Commit: 6e0762f3beb0d10e692e1e5fc6c3bd4c49510486
    https://github.com/scummvm/scummvm/commit/6e0762f3beb0d10e692e1e5fc6c3bd4c49510486
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-27T21:55:11-04:00

Commit Message:
MADS: Stop showing picture dialogs for items before you've picked them up

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



diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index db9ea2c..e5a59a0 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -425,7 +425,8 @@ void GameNebular::doObjectAction() {
 	} else if ((action.isAction(VERB_LOOK) || action.isAction(VERB_READ)) &&
 			((id = _objects.getIdFromDesc(action._activeAction._objectNameId)) > 0 ||
 			(action._activeAction._indirectObjectId > 0 &&
-			(id = _objects.getIdFromDesc(action._activeAction._indirectObjectId))))) {
+			(id = _objects.getIdFromDesc(action._activeAction._indirectObjectId)))) &&
+			_objects.isInInventory(id)) {
 		if (id == OBJ_REPAIR_LIST) {
 			dialogs._indexList[0] = _globals[kTeleporterCode + 7];
 			dialogs._indexList[1] = _globals[kTeleporterCode + 8];


Commit: 381ebe7816e023c29396f3661e0bf6ed2d9e9702
    https://github.com/scummvm/scummvm/commit/381ebe7816e023c29396f3661e0bf6ed2d9e9702
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-27T21:55:37-04:00

Commit Message:
MADS: Fix for picking up first bone in scene 202

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



diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 615deb8..6bea298 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -803,7 +803,7 @@ void Scene202::actions() {
 				_globals[kMeteorologistStatus] = METEOROLOGIST_ABSENT;
 		}
 		_scene->_nextSceneId = 201;
-	} else if (_action.isAction(VERB_TAKE, NOUN_BONE) && (_action._mainObjectSource == 4)) {
+	} else if (_action.isAction(VERB_TAKE, NOUN_BONE) && (_action._savedFields._mainObjectSource == 4)) {
 		switch (_game._trigger) {
 		case 0:
 			if (_game._objects.isInInventory(OBJ_BONES)) {
@@ -1010,6 +1010,8 @@ void Scene202::actions() {
 		_vm->_dialogs->show(20216);
 	} else if (_action.isAction(VERB_LOOK, NOUN_BONES) && _action._commandSource == 4) {
 		_vm->_dialogs->show(20217);
+	} else {
+		return;
 	}
 
 	_action._inProgress = false;