[Scummvm-cvs-logs] scummvm master -> 619a48dfbc2a37a4e7caa674bed5b2a2fbf49777

[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:
6e16840d56 TSAGE: Bugfix for showing tunic to guard in scene #9200
619a48dfbc TSAGES: Bugfixes for placing the candle and helmet in the inventory in scene #9500


Commit: 6e16840d56b1653845bf9a46c13a812fcd76a301
    https://github.com/scummvm/scummvm/commit/6e16840d56b1653845bf9a46c13a812fcd76a301
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-01T06:47:20-07:00

Commit Message:
TSAGE: Bugfix for showing tunic to guard in scene #9200

Changed paths:
    engines/tsage/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index c47a0ba..42a7696 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -307,16 +307,16 @@ void Scene9200::SceneHotspot1::doAction(int action) {
 		_globals->_player.disableControl();
 		if (_globals->getFlag(93)) {
 			scene->_sceneState = 9214;
-			setAction(&scene->_sequenceManager, scene, 9214, &_globals->_player, &scene->_object2, 0);
+			scene->setAction(&scene->_sequenceManager, scene, 9214, &_globals->_player, &scene->_object2, 0);
 		} else {
 			_globals->setFlag(93);
 			scene->_sceneState = 9213;
-			setAction(&scene->_sequenceManager, scene, 9213, &_globals->_player, &scene->_object2, 0);
+			scene->setAction(&scene->_sequenceManager, scene, 9213, &_globals->_player, &scene->_object2, 0);
 		}
 	} else if (action <= 100) {
 		_globals->_player.disableControl();
 		scene->_sceneState = 9214;
-		setAction(&scene->_sequenceManager, scene, 9214, &_globals->_player, &scene->_object2, 0);
+		scene->setAction(&scene->_sequenceManager, scene, 9214, &_globals->_player, &scene->_object2, 0);
 	} else {
 		NamedHotspot::doAction(action);
 	}


Commit: 619a48dfbc2a37a4e7caa674bed5b2a2fbf49777
    https://github.com/scummvm/scummvm/commit/619a48dfbc2a37a4e7caa674bed5b2a2fbf49777
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-01T06:57:34-07:00

Commit Message:
TSAGES: Bugfixes for placing the candle and helmet in the inventory in scene #9500

Changed paths:
    engines/tsage/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index 42a7696..87fd0ae 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -1081,6 +1081,7 @@ void Scene9500::signal() {
 		break;
 	case 9505:
 		_candle.setStrip(2);
+		RING_INVENTORY._candle._sceneNumber = 1;
 		_globals->_player.enableControl();
 		break;
 	case 9506:
@@ -1088,6 +1089,7 @@ void Scene9500::signal() {
 		_globals->_player.enableControl();
 		break;
 	case 9511:
+		RING_INVENTORY._helmet._sceneNumber = 1;
 		_globals->_player.enableControl();
 		if (!_globals->getFlag(51)) {
 			_globals->setFlag(51);