[Scummvm-cvs-logs] scummvm master -> 9678195674f9396051e373f8ebadd7dcc46bc479

[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:
9678195674 TSAGE: Renamings for R2R Rim lift exterior


Commit: 9678195674f9396051e373f8ebadd7dcc46bc479
    https://github.com/scummvm/scummvm/commit/9678195674f9396051e373f8ebadd7dcc46bc479
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-05T19:12:14-08:00

Commit Message:
TSAGE: Renamings for R2R Rim lift exterior

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 3cb6e2a..5c3fda2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -11547,12 +11547,12 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._characterScene[R2_QUINN] = 1800;
 	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1800;
 
-	_item2.setDetails(Rect(128, 95, 190, 135), 1800, 10, -1, -1, 1, NULL);
-	_item1.setDetails(Rect(95, 3, 223, 135), 1800, 0, -1, -1, 1, NULL);
+	_elevatorContents.setDetails(Rect(128, 95, 190, 135), 1800, 10, -1, -1, 1, NULL);
+	_elevator.setDetails(Rect(95, 3, 223, 135), 1800, 0, -1, -1, 1, NULL);
 
 	// Original was calling _item3.setDetails(Rect(1800, 11, 24, 23), 25, -1, -1, -1, 1, NULL);
 	// This is *wrong*. The following statement is a wild guess based on good common sense
-	_item3.setDetails(11, 1800, 23, 24, 25);
+	_surface.setDetails(11, 1800, 23, 24, 25);
 	_secBackground.setDetails(Rect(0, 0, 320, 200), 1800, 17, -1, 19, 1, NULL);
 
 	R2_GLOBALS._player.disableControl();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 899083b..b35bf67 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -869,9 +869,9 @@ public:
 	int _locationMode;
 	SpeakerQuinn _quinnSpeaker;
 	SpeakerSeeker _seekerSpeaker;
-	NamedHotspot _item1;
-	NamedHotspot _item2;
-	NamedHotspot _item3;
+	NamedHotspot _elevator;
+	NamedHotspot _elevatorContents;
+	NamedHotspot _surface;
 	NamedHotspot _secBackground;
 	Background _background;
 	SceneActor _playerShadow;