[Scummvm-cvs-logs] scummvm master -> 337c770856465fb9e61ada964eb76b068168734e

[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:
c76e1592f3 TSAGE: Fix parameter order in NamedHotspot class methods
337c770856 TSAGE: Bugfix for hallway setup, and picking up straw in the Blacksmith's room


Commit: c76e1592f3cd28902e2f606ab0f84473636ed990
    https://github.com/scummvm/scummvm/commit/c76e1592f3cd28902e2f606ab0f84473636ed990
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-01T05:30:47-07:00

Commit Message:
TSAGE: Fix parameter order in NamedHotspot class methods

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/core.h



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c1f1887..f03f10f 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1585,7 +1585,7 @@ void NamedHotspot::doAction(int action) {
 	}
 }
 
-void NamedHotspot::setup(const int ys, const int xe, const int ye, const int xs, const int resnum, const int lookLineNum, const int useLineNum) {
+void NamedHotspot::setup(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
 	setBounds(ys, xe, ye, xs);
 	_resnum = resnum;
 	_lookLineNum = lookLineNum;
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index c836264..45a39b2 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -432,7 +432,7 @@ public:
 	int _resnum, _lookLineNum, _useLineNum;
 	NamedHotspot() : SceneHotspot() {}
 
-	void setup(const int ys, const int xe, const int ye, const int xs, const int resnum, const int lookLineNum, const int useLineNum);
+	void setup(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
 	virtual void doAction(int action);
 	virtual Common::String getClassName() { return "NamedHotspot"; }
 	virtual void synchronise(Serialiser &s);


Commit: 337c770856465fb9e61ada964eb76b068168734e
    https://github.com/scummvm/scummvm/commit/337c770856465fb9e61ada964eb76b068168734e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-01T05:30:47-07:00

Commit Message:
TSAGE: Bugfix for hallway setup, and picking up straw in the Blacksmith's room

Changed paths:
    engines/tsage/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index bed8b54..4834643 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -587,7 +587,7 @@ void Scene9350::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(95, 80, 200, 100);
 	_globals->_player.postInit();
 
-	_object1.setup(9350, 1, 3, 139, 97, 0);
+	_object1.setup(9351, 1, 3, 139, 97, 0);
 	_sceneHotspot1.setup(42, 0, 97, 60, 9350, 0, -1);
 	_sceneHotspot2.setup(37, 205, 82, 256, 9350, 0, -1);
 	_sceneHotspot3.setup(29, 93, 92, 174, 9350, 1, -1);
@@ -600,22 +600,22 @@ void Scene9350::postInit(SceneObjectList *OwnerList) {
 	if (_globals->_sceneManager._previousScene == 9360) {
 		_globals->_player.disableControl();
 		_sceneState = 9352;
-		setAction(&_sequenceManager, this, 9352, &_globals->_player, &_object2, 0);
+		setAction(&_sequenceManager, this, 9352, &_globals->_player, &_object2, NULL);
 	} else if (_globals->_sceneManager._previousScene == 9400) {
 		_globals->_player.disableControl();
 		_sceneState = 9353;
-		setAction(&_sequenceManager, this, 9353, &_globals->_player, &_object2, 0);
+		setAction(&_sequenceManager, this, 9353, &_globals->_player, &_object2, NULL);
 	} else {
-		if (!_globals->getFlag(84)) {
+		if (_globals->getFlag(84)) {
 			_globals->clearFlag(84);
 			_object2.postInit();
 			_globals->_player.disableControl();
 			_sceneState = 9359;
-			setAction(&_sequenceManager, this, 9359, &_globals->_player, &_object2, 0);
+			setAction(&_sequenceManager, this, 9359, &_globals->_player, &_object2, NULL);
 		} else {
 			_globals->_player.disableControl();
 			_sceneState = 9354;
-			setAction(&_sequenceManager, this, 9354, &_globals->_player, &_object2, 0);
+			setAction(&_sequenceManager, this, 9354, &_globals->_player, &_object2, NULL);
 		}
 	}
 }
@@ -711,6 +711,7 @@ void Scene9400::SceneHotspot7::doAction(int action) {
 
 	if ((action == CURSOR_USE) && (RING_INVENTORY._straw._sceneNumber != 1)) {
 		scene->_sceneState = 1;
+		RING_INVENTORY._straw._sceneNumber = 1;
 		scene->setAction(&scene->_sequenceManager, scene, 9408, &_globals->_player, 0);
 	} else {
 		NamedHotspot::doAction(action);