[Scummvm-cvs-logs] scummvm master -> 4d3b33f6563c34d657c6ef75390db1a2a8e934de

[dreammaster]

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:
4d3b33f656 TSAGE: Renamings for R2R Spill Mountains elevator


Commit: 4d3b33f6563c34d657c6ef75390db1a2a8e934de
    https://github.com/scummvm/scummvm/commit/4d3b33f6563c34d657c6ef75390db1a2a8e934de
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T16:08:39-08:00

Commit Message:
TSAGE: Renamings for R2R Spill Mountains elevator

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp
    engines/tsage/ringworld2/ringworld2_scenes1.h
    engines/tsage/ringworld2/ringworld2_speakers.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index a998882..3b7198b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -12839,23 +12839,23 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 		_rightDoor.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
 
 	if (R2_GLOBALS._sceneManager._previousScene != 1875) {
-		_object1.postInit();
-		_object1.setup(1945, 6, 1);
-		_object1.setPosition(Common::Point(96, 109));
-		_object1.fixPriority(80);
+		_leftDoorFrame.postInit();
+		_leftDoorFrame.setup(1945, 6, 1);
+		_leftDoorFrame.setPosition(Common::Point(96, 109));
+		_leftDoorFrame.fixPriority(80);
 
-		_object2.postInit();
-		_object2.setup(1945, 6, 2);
-		_object2.setPosition(Common::Point(223, 109));
-		_object2.fixPriority(80);
+		_rightDoorFrame.postInit();
+		_rightDoorFrame.setup(1945, 6, 2);
+		_rightDoorFrame.setPosition(Common::Point(223, 109));
+		_rightDoorFrame.fixPriority(80);
 	}
 
 	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1875) {
 		R2_GLOBALS._player._characterIndex = R2_QUINN;
-		_actor1.postInit();
+		_companion.postInit();
 		_sceneMode = 20;
 		R2_GLOBALS._player.setAction(&_sequenceManager1, NULL, 1901, &R2_GLOBALS._player, &_leftDoor, NULL);
-		_actor1.setAction(&_sequenceManager2, this, 1900, &_actor1, &_rightDoor, NULL);
+		_companion.setAction(&_sequenceManager2, this, 1900, &_companion, &_rightDoor, NULL);
 	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1925) {
 		if (R2_GLOBALS.getFlag(29)) {
 			R2_GLOBALS.clearFlag(29);
@@ -12874,24 +12874,24 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 		}
 
 		if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
-			_actor1.postInit();
-			_actor1.setPosition(Common::Point(30, 110));
+			_companion.postInit();
+			_companion.setPosition(Common::Point(30, 110));
 			R2_GLOBALS._walkRegions.disableRegion(1);
-			_actor1.setup(2008, 3, 1);
-			_actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+			_companion.setup(2008, 3, 1);
+			_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
 		}
 		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
 	} else {
 		if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
-			_actor1.postInit();
-			_actor1.setPosition(Common::Point(30, 110));
+			_companion.postInit();
+			_companion.setPosition(Common::Point(30, 110));
 			R2_GLOBALS._walkRegions.disableRegion(1);
 			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-				_actor1.setup(20, 3, 1);
-				_actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
+				_companion.setup(20, 3, 1);
+				_companion.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
 			} else {
-				_actor1.setup(2008, 3, 1);
-				_actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+				_companion.setup(2008, 3, 1);
+				_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
 			}
 		}
 
@@ -12954,7 +12954,7 @@ void Scene1900::signal() {
 		break;
 	case 22:
 		_sceneMode = 1910;
-		_actor1.setAction(&_sequenceManager2, this, 1910, &_actor1, NULL);
+		_companion.setAction(&_sequenceManager2, this, 1910, &_companion, NULL);
 		break;
 	case 1904:
 		R2_GLOBALS._scene1925CurrLevel = -3;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index f636382..e4382d8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -998,9 +998,9 @@ public:
 	SpeakerSeeker1900 _seekerSpeaker;
 	NamedHotspot _background;
 	NamedHotspot _elevator;
-	SceneActor _actor1;
-	BackgroundSceneObject _object1;
-	BackgroundSceneObject _object2;
+	SceneActor _companion;
+	BackgroundSceneObject _leftDoorFrame;
+	BackgroundSceneObject _rightDoorFrame;
 	LiftDoor _leftDoor, _rightDoor;
 	WestExit _westExit;
 	EastExit _eastExit;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 5f0500c..a6bfc39 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -2151,7 +2151,7 @@ void SpeakerSeeker1900::proc15() {
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 1900);
 			Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_actor1;
+			_object2 = &scene->_companion;
 		}
 
 		_object2->hide();