[Scummvm-cvs-logs] scummvm master -> 2a130a88182adc505008799f306844395f07dd4e

[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:
9e9bd02ccd MADS: Changed several values to constants in action setup
2a130a8818 MADS: Fix for getting bones in scene 752


Commit: 9e9bd02ccd5dd07122960282e55c7b24ebc9c183
    https://github.com/scummvm/scummvm/commit/9e9bd02ccd5dd07122960282e55c7b24ebc9c183
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-03T21:33:08-04:00

Commit Message:
MADS: Changed several values to constants in action setup

Changed paths:
    engines/mads/action.cpp



diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index 207fcd9..199ae39 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -57,12 +57,12 @@ MADSAction::MADSAction(MADSEngine *vm) : _vm(vm) {
 	_inProgress = false;
 	_pickedWord = -1;
 
-	_savedFields._commandSource = 0;
-	_savedFields._mainObjectSource = 0;
+	_savedFields._commandSource = CAT_NONE;
+	_savedFields._mainObjectSource = CAT_NONE;
 	_savedFields._command = -1;
 	_savedFields._mainObject = 0;
 	_savedFields._secondObject = 0;
-	_savedFields._secondObjectSource = 0;
+	_savedFields._secondObjectSource = CAT_NONE;
 	_savedFields._articleNumber = PREP_NONE;
 	_savedFields._lookFlag = false;
 


Commit: 2a130a88182adc505008799f306844395f07dd4e
    https://github.com/scummvm/scummvm/commit/2a130a88182adc505008799f306844395f07dd4e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-03T21:33:31-04:00

Commit Message:
MADS: Fix for getting bones in scene 752

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



diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 584c1c7..930bb7c 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -2603,7 +2603,7 @@ void Scene752::actions() {
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 			break;
 		case 1:
-			_vm->_sound->command(0xF);
+			_vm->_sound->command(15);
 			_scene->_sequences.remove(_globals._sequenceIndexes[13]);
 			_game._objects.addToInventory(OBJ_ID_CARD);
 			_scene->_dynamicHotspots.remove(_cardId);
@@ -2616,7 +2616,8 @@ void Scene752::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(VERB_TAKE, NOUN_BONES) && (_action._mainObjectSource == 4) && (!_game._objects.isInInventory(OBJ_BONES) || _game._trigger)) {
+	} else if (_action.isAction(VERB_TAKE, NOUN_BONES) && (_action._savedFields._mainObjectSource == CAT_HOTSPOT) && 
+			(!_game._objects.isInInventory(OBJ_BONES) || _game._trigger)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -2627,9 +2628,9 @@ void Scene752::actions() {
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 			break;
 		case 1:
-			_vm->_sound->command(0xF);
+			_vm->_sound->command(15);
 			if (_game._objects.isInInventory(OBJ_BONE))
-				_game._objects.setRoom(OBJ_BONE, 1);
+				_game._objects.setRoom(OBJ_BONE, NOWHERE);
 			_game._objects.addToInventory(OBJ_BONES);
 			_vm->_dialogs->showItem(OBJ_BONES, 75221);
 			break;
@@ -2658,12 +2659,12 @@ void Scene752::actions() {
 		_vm->_dialogs->show(75217);
 	else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER))
 		_vm->_dialogs->show(75218);
-	else if ((_action.isAction(VERB_LOOK, NOUN_BONES) || _action.isAction(VERB_LOOK, NOUN_ID_CARD)) && (_action._mainObjectSource == 4)) {
+	else if ((_action.isAction(VERB_LOOK, NOUN_BONES) || _action.isAction(VERB_LOOK, NOUN_ID_CARD)) && (_action._mainObjectSource == CAT_HOTSPOT)) {
 		if (_game._objects[OBJ_ID_CARD]._roomNumber == 752)
 			_vm->_dialogs->show(75219);
 		else
 			_vm->_dialogs->show(75220);
-	} else if (_action.isAction(VERB_TAKE, NOUN_BONES) && (_action._mainObjectSource == 4)) {
+	} else if (_action.isAction(VERB_TAKE, NOUN_BONES) && (_action._savedFields._mainObjectSource == CAT_HOTSPOT)) {
 		if (_game._objects.isInInventory(OBJ_BONES))
 			_vm->_dialogs->show(75222);
 	} else