[Scummvm-cvs-logs] scummvm master -> 6a7c95b61640c320c7272f1ef13d8a53ff61f485

[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:
6a7c95b616 TSAGE: Renamings for Spill Mountains Large Ledge


Commit: 6a7c95b61640c320c7272f1ef13d8a53ff61f485
    https://github.com/scummvm/scummvm/commit/6a7c95b61640c320c7272f1ef13d8a53ff61f485
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T07:59:26-08:00

Commit Message:
TSAGE: Renamings for Spill Mountains Large Ledge

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



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index f778127..e5d8b07 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -204,7 +204,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Spill Mountains: Inside crevasse
 		return new Scene2455();
 	case 2500:
-		// Spill Mountains: Large Cave
+		// Spill Mountains: Large Ledge
 		return new Scene2500();
 	case 2525:
 		// Spill Mountains: Furnace room
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 5bfae5c..1b7899b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2394,7 +2394,7 @@ void Scene2455::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2500 - Spill Mountains: Large Cave
+ * Scene 2500 - Spill Mountains: Large Ledge
  *
  *--------------------------------------------------------------------------*/
 
@@ -2440,19 +2440,19 @@ void Scene2500::postInit(SceneObjectList *OwnerList) {
 	}
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
-		_actor1.postInit();
+		_companion.postInit();
 		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			_actor1.setup(21, 3, 1);
-			_actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *)NULL);
+			_companion.setup(21, 3, 1);
+			_companion.setDetails(9002, 1, -1, -1, 1, (SceneItem *)NULL);
 		} else {
-			_actor1.setup(2008, 3, 1);
-			_actor1.changeZoom(50);
-			_actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *)NULL);
+			_companion.setup(2008, 3, 1);
+			_companion.changeZoom(50);
+			_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *)NULL);
 		}
-		_actor1.setPosition(Common::Point(141, 94));
+		_companion.setPosition(Common::Point(141, 94));
 	}
 
-	_item1.setDetails(Rect(0, 0, 320, 200), 2430, 0, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, 320, 200), 2430, 0, -1, -1, 1, NULL);
 	R2_GLOBALS._player.disableControl();
 
 	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
@@ -2463,9 +2463,9 @@ void Scene2500::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.addMover(mover, &pt, this);
 	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 3100) {
 		_sceneMode = 2500;
-		_actor2.postInit();
-		_actor3.postInit();
-		setAction(&_sequenceManager, this, 2500, &R2_GLOBALS._player, &_actor2, &_actor3, NULL);
+		_quinn.postInit();
+		_ship.postInit();
+		setAction(&_sequenceManager, this, 2500, &R2_GLOBALS._player, &_quinn, &_ship, NULL);
 	} else {
 		R2_GLOBALS._player.setPosition(Common::Point(160, 150));
 		R2_GLOBALS._player.setStrip(3);
@@ -2482,7 +2482,7 @@ void Scene2500::signal() {
 	case 20:
 		R2_GLOBALS._player.disableControl();
 		_sceneMode = 2501;
-		setAction(&_sequenceManager, this, 2501, &R2_GLOBALS._player, &_actor2, &_actor3, NULL);
+		setAction(&_sequenceManager, this, 2501, &R2_GLOBALS._player, &_quinn, &_ship, NULL);
 		break;
 	case 2500:
 		_sceneMode = 20;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index b9d3cbe..0c67426 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -372,10 +372,10 @@ public:
 	SpeakerSeeker _seekerSpeaker;
 	SpeakerMiranda _mirandaSpeaker;
 	SpeakerWebbster2500 _webbsterSpeaker;
-	NamedHotspot _item1;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
+	NamedHotspot _background;
+	SceneActor _companion;
+	SceneActor _quinn;
+	SceneActor _ship;
 	Exit1 _exit1;
 	SequenceManager _sequenceManager;