2 files changed, 45 insertions, 43 deletions

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 68131f9b7a..164679b80e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -35,13 +35,13 @@ namespace Ringworld2 {
  *--------------------------------------------------------------------------*/
 
 Scene3100::Scene3100() {
-	_field412 = 0;
+	_fadeSound = false;
 }
 
 void Scene3100::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 
-	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_fadeSound);
 }
 
 bool Scene3100::Guard::startAction(CursorType action, Event &event) {
@@ -84,20 +84,21 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._characterIndex = R2_QUINN;
 	R2_GLOBALS._player.disableControl();
 
-	_actor1.postInit();
-	_item2.setDetails(Rect(212, 97, 320, 114), 3100, 3, -1, -1, 1, NULL);
-	_item1.setDetails(Rect(0, 0, 480, 200), 3100, 0, -1, -1, 1, NULL);
-	_field412 = 0;
+	_hammerHead.postInit();
+	_hammerHead2.setDetails(Rect(212, 97, 320, 114), 3100, 3, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, 480, 200), 3100, 0, -1, -1, 1, NULL);
+	_fadeSound = false;
 
 	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
 		if (R2_GLOBALS._player._oldCharacterScene[R2_QUINN] == 3100) {
 			_sceneMode = 3102;
-			_actor3.postInit();
-			_actor4.postInit();
-			_actor5.postInit();
+			_ghoul.postInit();
+			_technicians.postInit();
+			_deadBodies.postInit();
 			R2_GLOBALS._sound1.play(274);
 			_sound1.fadeSound(130);
-			setAction(&_sequenceManager, this, 3102, &_actor1, &R2_GLOBALS._player, &_actor3, &_actor4, &_actor5, NULL);
+			setAction(&_sequenceManager, this, 3102, &_hammerHead, &R2_GLOBALS._player, 
+				&_ghoul, &_technicians, &_deadBodies, NULL);
 		} else {
 			_guard.postInit();
 			_guard.setup(3110, 5, 1);
@@ -105,27 +106,28 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 			_guard.setPosition(Common::Point(10, 149));
 			_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
 
-			_actor4.postInit();
-			_actor4.setup(3103, 1, 1);
-			_actor4.setPosition(Common::Point(278, 113));
-			_actor4.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL);
-			_actor4.animate(ANIM_MODE_2, NULL);
+			_technicians.postInit();
+			_technicians.setup(3103, 1, 1);
+			_technicians.setPosition(Common::Point(278, 113));
+			_technicians.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL);
+			_technicians.animate(ANIM_MODE_2, NULL);
 
-			_field412 = 1;
-			_actor1.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL);
+			_fadeSound = true;
+			_hammerHead.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL);
 			R2_GLOBALS._sound1.play(243);
 			R2_GLOBALS._sound2.play(130);
 			_sceneMode = 3100;
 
-			setAction(&_sequenceManager, this, 3100, &R2_GLOBALS._player, &_actor1, NULL);
+			setAction(&_sequenceManager, this, 3100, &R2_GLOBALS._player, &_hammerHead, NULL);
 		}
 	} else if (R2_GLOBALS._sceneManager._previousScene == 3255) {
 		_sceneMode = 3101;
-		_actor2.postInit();
-		_actor3.postInit();
-		_field412 = 1;
+		_miranda.postInit();
+		_ghoul.postInit();
+		_fadeSound = true;
 
-		setAction(&_sequenceManager, this, 3101, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+		setAction(&_sequenceManager, this, 3101, &R2_GLOBALS._player, &_hammerHead, 
+			&_miranda, &_ghoul, NULL);
 	} else {
 		_guard.postInit();
 		_guard.setup(3110, 5, 1);
@@ -133,16 +135,16 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 		_guard.setPosition(Common::Point(10, 149));
 		_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
 
-		_actor4.postInit();
-		_actor4.setup(3103, 1, 1);
-		_actor4.setPosition(Common::Point(278, 113));
-		_actor4.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL);
-		_actor4.animate(ANIM_MODE_2, NULL);
+		_technicians.postInit();
+		_technicians.setup(3103, 1, 1);
+		_technicians.setPosition(Common::Point(278, 113));
+		_technicians.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL);
+		_technicians.animate(ANIM_MODE_2, NULL);
 
-		_actor1.postInit();
-		_actor1.setup(3104, 4, 1);
-		_actor1.setPosition(Common::Point(143, 104));
-		_actor1.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL);
+		_hammerHead.postInit();
+		_hammerHead.setup(3104, 4, 1);
+		_hammerHead.setPosition(Common::Point(143, 104));
+		_hammerHead.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL);
 
 		R2_GLOBALS._player.setup(3110, 3, 1);
 		R2_GLOBALS._player.changeZoom(50);
@@ -189,13 +191,13 @@ void Scene3100::signal() {
 }
 
 void Scene3100::dispatch() {
-	if ((_sceneMode == 3100) && (_field412 != 0) && (R2_GLOBALS._player._position.y == 104)) {
-		_field412 = 0;
+	if ((_sceneMode == 3100) && _fadeSound && (R2_GLOBALS._player._position.y == 104)) {
+		_fadeSound = false;
 		R2_GLOBALS._sound2.fadeOut2(NULL);
 	}
 
-	if ((_sceneMode == 3101) && (_field412 != 0) && (R2_GLOBALS._player._position.y < 104)) {
-		_field412 = 0;
+	if ((_sceneMode == 3101) && _fadeSound && (R2_GLOBALS._player._position.y < 104)) {
+		_fadeSound = false;
 		_sound1.fadeSound(130);
 	}
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 6c7a594b12..b4a1e86046 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -45,15 +45,15 @@ class Scene3100 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
-	int _field412;
+	bool _fadeSound;
 	SpeakerGuard _guardSpeaker;
-	NamedHotspot _item1;
-	NamedHotspot _item2;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
-	SceneActor _actor4;
-	SceneActor _actor5;
+	NamedHotspot _background;
+	NamedHotspot _hammerHead2;
+	SceneActor _hammerHead;
+	SceneActor _miranda;
+	SceneActor _ghoul;
+	SceneActor _technicians;
+	SceneActor _deadBodies;
 	Guard _guard;
 	ASoundExt _sound1;
 	SequenceManager _sequenceManager;