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

[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:
196a30754e TSAGE: R2R scene areas shouldn't be processed when the player is disabled
bdfdfc6166 TSAGE: Fixed some cursor constants used in R2R scene 300


Commit: 196a30754e70d925c60632fa63b7f80953fef515
    https://github.com/scummvm/scummvm/commit/196a30754e70d925c60632fa63b7f80953fef515
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-01T03:54:08-08:00

Commit Message:
TSAGE: R2R scene areas shouldn't be processed when the player is disabled

Changed paths:
    engines/tsage/ringworld2/ringworld2_logic.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e9e205b..079ac62 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -358,7 +358,7 @@ void SceneHandlerExt::process(Event &event) {
 	}
 
 	SceneExt *scene = static_cast<SceneExt *>(R2_GLOBALS._sceneManager._scene);
-	if (scene) {
+	if (scene && R2_GLOBALS._player._uiEnabled) {
 		// Handle any scene areas that have been registered
 		SynchronizedList<SceneArea *>::iterator saIter;
 		for (saIter = scene->_sceneAreas.begin(); saIter != scene->_sceneAreas.end() && !event.handled; ++saIter) {


Commit: bdfdfc6166970ada95123fecf409c3d50b0e7e7e
    https://github.com/scummvm/scummvm/commit/bdfdfc6166970ada95123fecf409c3d50b0e7e7e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-01T03:54:09-08:00

Commit Message:
TSAGE: Fixed some cursor constants used in R2R scene 300

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index f542dde..5ca1785 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1528,10 +1528,10 @@ bool Scene300::Miranda::startAction(CursorType action, Event &event) {
 	switch (action) {
 	case CURSOR_TALK:
 		if (R2_GLOBALS._player._characterIndex == 1) {
-			
+			warning("TODO: talk sequence");
 		} else {
 			scene->_sceneMode = 10;
-			R2_GLOBALS._events.setCursor(CURSOR_WALK); // TODO: Determine correct cursor
+			R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 
 			if (!R2_GLOBALS.getFlag(44))
 				scene->_field412 = 174 + R2_GLOBALS._randomSource.getRandomNumber(2);
@@ -1782,7 +1782,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 				if (R2_GLOBALS.getFlag(55)) {
 					if (R2_GLOBALS.getFlag(57)) {
 						R2_GLOBALS.clearFlag(60);
-						R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Find correct cursor
+						R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 						_sceneMode = 16;
 						_stripManager.start(404, this);
 					} else {
@@ -1792,7 +1792,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 				} else {
 					if (R2_GLOBALS.getFlag(45)) {
 						R2_GLOBALS.clearFlag(60);
-						R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Find correct cursor
+						R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 						_sceneMode = 12;
 						_stripManager.start3(204, this, R2_GLOBALS._stripManager_lookupList);
 					} else {
@@ -1806,7 +1806,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS.setFlag(60);
 			R2_GLOBALS._player.setup(302, 3, 1);
 			R2_GLOBALS._player.setPosition(Common::Point(271, 150));
-			R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor #2
+			R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 
 			if (R2_GLOBALS.getFlag(51)) {
 				_sceneMode = 13;
@@ -1830,7 +1830,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._player.setup(302, 3, 1);
 			R2_GLOBALS._player.setPosition(Common::Point(271, 150));
 			_sceneMode = 17;
-			R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor #2
+			R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 			_stripManager.start(413, this);
 			break;
 
@@ -1966,7 +1966,7 @@ void Scene300::signal() {
 		R2_GLOBALS.setFlag(38);
 		R2_GLOBALS.setFlag(44);
 		R2_GLOBALS.setFlag(51);
-		R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor 2
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_sceneMode = 16;
 		_stripManager.start3(401, this, R2_GLOBALS._stripManager_lookupList);
 		break;
@@ -2021,7 +2021,7 @@ void Scene300::signal() {
 
 	case 308:
 		_sceneMode = 18;
-		R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor 2
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_stripManager.start(418, this);
 		break;
 
@@ -2030,7 +2030,7 @@ void Scene300::signal() {
 		// Deliberate fall-through
 	case 309:
 		signal309();
-		R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor 2
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_sceneMode = 10;
 		_stripManager.start3(_field412, this, R2_GLOBALS._stripManager_lookupList);
 		break;
@@ -2039,7 +2039,7 @@ void Scene300::signal() {
 		_sceneMode = 14;
 		R2_GLOBALS._player._effect = 0;
 		_seeker.setAction(&_sequenceManager3, this, 314, &_seeker, &_doorway, NULL);
-		R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor 2
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_stripManager.start(301, this);
 		break;
 
@@ -2057,18 +2057,18 @@ void Scene300::signal() {
 	case 316:
 		R2_GLOBALS._player._characterScene[2] = 500;
 		_seeker.remove();
-		R2_GLOBALS._player.enableControl(/* TODO: Cursor #3 */);
+		R2_GLOBALS._player.enableControl(CURSOR_CROSSHAIRS);
 		break;
 
 	case 317:
 		_sceneMode = 19;
-		R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor 2
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_stripManager.start(419, this);
 		break;
 
 	case 318:
 		_sceneMode = 20;
-		R2_GLOBALS._events.setCursor(CURSOR_USE);	// TODO: Cursor 2
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_stripManager.start(420, this);
 		break;