[Scummvm-cvs-logs] scummvm master -> 086b0e505730a5168dc85371214d9904fbb16284

[Strangerke]

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

Summary:
086b0e5057 TSAGE: R2R - Scene 3100 (space port): Fix cursor used in signal(), rename an object


Commit: 086b0e505730a5168dc85371214d9904fbb16284
    https://github.com/scummvm/scummvm/commit/086b0e505730a5168dc85371214d9904fbb16284
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-12-22T10:42:13-08:00

Commit Message:
TSAGE: R2R - Scene 3100 (space port): Fix cursor used in signal(), rename an object

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes3.cpp
    engines/tsage/ringworld2/ringworld2_scenes3.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index aa7361b..a46c3f7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -43,7 +43,7 @@ void Scene3100::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_field412);
 }
 
-bool Scene3100::Actor6::startAction(CursorType action, Event &event) {
+bool Scene3100::Guard::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
 
@@ -98,11 +98,11 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 			_sound1.fadeSound(130);
 			setAction(&_sequenceManager, this, 3102, &_actor1, &R2_GLOBALS._player, &_actor3, &_actor4, &_actor5, NULL);
 		} else {
-			_actor6.postInit();
-			_actor6.setup(3110, 5, 1);
-			_actor6.changeZoom(50);
-			_actor6.setPosition(Common::Point(10, 149));
-			_actor6.setDetails(3100, 6, -1, -1, 2, NULL);
+			_guard.postInit();
+			_guard.setup(3110, 5, 1);
+			_guard.changeZoom(50);
+			_guard.setPosition(Common::Point(10, 149));
+			_guard.setDetails(3100, 6, -1, -1, 2, NULL);
 
 			_actor4.postInit();
 			_actor4.setup(3103, 1, 1);
@@ -126,11 +126,11 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 
 		setAction(&_sequenceManager, this, 3101, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
 	} else {
-		_actor6.postInit();
-		_actor6.setup(3110, 5, 1);
-		_actor6.changeZoom(50);
-		_actor6.setPosition(Common::Point(10, 149));
-		_actor6.setDetails(3100, 6, -1, -1, 2, NULL);
+		_guard.postInit();
+		_guard.setup(3110, 5, 1);
+		_guard.changeZoom(50);
+		_guard.setPosition(Common::Point(10, 149));
+		_guard.setDetails(3100, 6, -1, -1, 2, NULL);
 		
 		_actor4.postInit();
 		_actor4.setup(3103, 1, 1);
@@ -167,8 +167,7 @@ void Scene3100::remove() {
 void Scene3100::signal() {
 	switch (_sceneMode) {
 	case 10:
-		warning("TODO: Unknown cursor used (6/-6)");
-		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	case 3100:
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 96fa65e..ab98a8d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -41,7 +41,7 @@ using namespace TsAGE;
 
 
 class Scene3100 : public SceneExt {
-	class Actor6 : public SceneActor {
+	class Guard : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
@@ -55,7 +55,7 @@ public:
 	SceneActor _actor3;
 	SceneActor _actor4;
 	SceneActor _actor5;
-	Actor6 _actor6;
+	Guard _guard;
 	ASoundExt _sound1;
 	SequenceManager _sequenceManager;