[Scummvm-cvs-logs] scummvm master -> 25da8bb3e4e0436409fd9768e8c1e254c5d3d577

[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:
25da8bb3e4 TSAGE: Renamings for R2R Elevator shaft bottom


Commit: 25da8bb3e4e0436409fd9768e8c1e254c5d3d577
    https://github.com/scummvm/scummvm/commit/25da8bb3e4e0436409fd9768e8c1e254c5d3d577
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T15:30:14-08:00

Commit Message:
TSAGE: Renamings for R2R Elevator shaft bottom

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index ba1997b..4bb1865 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -13483,14 +13483,14 @@ void Scene1945::postInit(SceneObjectList *OwnerList) {
 		else
 			_gunpowder.hide();
 
-		_actor1.postInit();
-		_actor1.setup(1945, 8, 1);
-		_actor1.setPosition(Common::Point(253, 169));
-		_actor1.fixPriority(130);
-
-		_actor2.postInit();
-		_actor2.setup(1945, 3, 1);
-		_actor2.hide();
+		_coveringIce.postInit();
+		_coveringIce.setup(1945, 8, 1);
+		_coveringIce.setPosition(Common::Point(253, 169));
+		_coveringIce.fixPriority(130);
+
+		_alcoholLamp.postInit();
+		_alcoholLamp.setup(1945, 3, 1);
+		_alcoholLamp.hide();
 	} else {
 		_corridorExit._enabled = true;
 	}
@@ -13519,8 +13519,8 @@ void Scene1945::postInit(SceneObjectList *OwnerList) {
 	_nextSceneMode2 = 0;
 
 	_ice.setDetails(11, 1945, 3, -1, 5);
-	_item1.setDetails(Rect(238, 144, 274, 167), 1945, 0, -1, 2, 1, NULL);
-	_item2.setDetails(Rect(27, 3, 292, 167), 1945, 3, -1, -1, 1, NULL);
+	_hole.setDetails(Rect(238, 144, 274, 167), 1945, 0, -1, 2, 1, NULL);
+	_ice2.setDetails(Rect(27, 3, 292, 167), 1945, 3, -1, -1, 1, NULL);
 }
 
 void Scene1945::remove() {
@@ -13533,7 +13533,7 @@ void Scene1945::signal() {
 	case 1940:
 		if (_nextSceneMode1 == 1943) {
 			_sceneMode = _nextSceneMode1;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor2, NULL);
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
 		} else {
 			_sceneMode = 1946;
 			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
@@ -13560,7 +13560,7 @@ void Scene1945::signal() {
 		R2_GLOBALS._sound1.fadeOut2(NULL);
 		R2_INVENTORY.setObjectScene(_lampUsed, 0);
 		_sceneMode = 1948;
-		setAction(&_sequenceManager1, this, _sceneMode, &_gunpowder, &_actor2, &_actor1, NULL);
+		setAction(&_sequenceManager1, this, _sceneMode, &_gunpowder, &_alcoholLamp, &_coveringIce, NULL);
 		R2_GLOBALS._player.setAction(&_sequenceManager2, NULL, 1941, &R2_GLOBALS._player, NULL);
 		return;
 	case 1944:
@@ -13580,7 +13580,7 @@ void Scene1945::signal() {
 		if (_nextSceneMode1 == 1943) {
 			_sceneMode = _nextSceneMode1;
 			_nextSceneMode1 = 1948;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor2, NULL);
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
 		} else {
 			_sceneMode = 1941;
 			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
@@ -13599,7 +13599,7 @@ void Scene1945::signal() {
 		if (_nextSceneMode2 == 1943) {
 			_nextSceneMode1 = _nextSceneMode2;
 			_nextSceneMode2 = 0;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor2, NULL);
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
 		} else {
 			_nextSceneMode1 = 0;
 			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 7ea4ab1..1d9ab3e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -1084,12 +1084,12 @@ class Scene1945 : public SceneExt {
 		virtual void changeScene();
 	};
 public:
-	NamedHotspot _item1;
-	NamedHotspot _item2;
+	NamedHotspot _hole;
+	NamedHotspot _ice2;
 	Ice _ice;
 	Ladder _ladder;
-	SceneActor _actor1;
-	SceneActor _actor2;
+	SceneActor _coveringIce;
+	SceneActor _alcoholLamp;
 	Gunpowder _gunpowder;
 	ExitUp _exitUp;
 	CorridorExit _corridorExit;