From 16a2a0babaacf2e19f993465c4c676f0d36e73fc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 13:08:52 -0400
Subject: TSAGE: Renaming for R2R ARM hanger base

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

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;
-- 
cgit v1.2.3


From b3e56ddc2bd87ad063a22227ea88315e350ac01c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 16:39:20 -0400
Subject: TSAGE: Renaming for R2R ghoul dormitory

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index b4a1e86046..9f519aa065 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -84,7 +84,7 @@ class Scene3125 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
-	int _field412;
+	bool _soundPlayed;
 	Background _background;
 	Door _door;
 	Table _table;
@@ -93,9 +93,7 @@ public:
 	SceneActor _ghoul2;
 	SceneActor _ghoul3;
 	SceneActor _ghoul4;
-	SequenceManager _sequenceManager1;
-	// Second sequence manager... Unused?
-	SequenceManager _sequenceManager2;
+	SequenceManager _sequenceManager;
 
 	Scene3125();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From fc742abae797064656cbaaf8054ee7a7e2beb927 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 16:58:44 -0400
Subject: TSAGE: Renamings for R2R Miranda's cell

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 9f519aa065..8bf6eb55b9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -117,7 +117,7 @@ class Scene3150 : public SceneExt {
 	class FoodTray : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Actor6 : public SceneActor {
+	class ToiletFlush : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 	class AirVent : public SceneActor {
@@ -144,7 +144,7 @@ public:
 	SceneActor _bulbOrWire;
 	Water _water;
 	FoodTray _foodTray;
-	Actor6 _toiletFlush;
+	ToiletFlush _toiletFlush;
 	AirVent _airVent;
 	DoorExit _doorExit;
 	VentExit _ventExit;
-- 
cgit v1.2.3


From 3cdf10046d35d0623200d2ceb117ad3638e1896c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 17:16:51 -0400
Subject: TSAGE: Renaming for R2R autopsy room

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 8bf6eb55b9..969c49a807 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -156,7 +156,7 @@ public:
 };
 
 class Scene3175 : public SceneExt {
-	class Item1 : public NamedHotspot {
+	class RoomItem : public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -168,11 +168,11 @@ class Scene3175 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
-	Item1 _background;
-	Item1 _item2;
-	Item1 _item3;
+	RoomItem _background;
+	RoomItem _table;
+	RoomItem _autopsies;
 	Door _door;
-	SceneActor _actor2;
+	SceneActor _computer;
 	Corpse _corpse;
 	SequenceManager _sequenceManager;
 
-- 
cgit v1.2.3


From 88485f2b1fa783fb72258d4b8558e35d6bee4c6a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 17:50:50 -0400
Subject: TSAGE: Renamings for R2R guard cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 969c49a807..af5466edaa 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -185,9 +185,9 @@ public:
 	SpeakerRocko3200 _rockoSpeaker;
 	SpeakerJocko3200 _jockoSpeaker;
 	SpeakerSocko3200 _sockoSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
+	SceneActor _rocko;
+	SceneActor _jocko;
+	SceneActor _socko;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From dd8271b32f64f4031caa39fd2e981c1f2912555e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 17:56:08 -0400
Subject: TSAGE: Renamings for R2R captain/private cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index af5466edaa..acd81ded0e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -198,8 +198,8 @@ class Scene3210 : public SceneExt {
 public:
 	SpeakerCaptain3210 _captainSpeaker;
 	SpeakerPrivate3210 _privateSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
+	SceneActor _captain;
+	SceneActor _private;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 49a4564bb25e2a99d9533747af0b8232c21f1964 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 17:59:11 -0400
Subject: TSAGE: Renaming for R2R Rocko/Jocko cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index acd81ded0e..587e5dc51f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -210,8 +210,8 @@ class Scene3220 : public SceneExt {
 public:
 	SpeakerRocko3220 _rockoSpeaker;
 	SpeakerJocko3220 _jockoSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
+	SceneActor _rocko;
+	SceneActor _jocko;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 4dfd751210acdf0d2879e68f411b2ca5842fb411 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 18:05:57 -0400
Subject: TSAGE: Renamings for R2R guard cutscene 3230

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 587e5dc51f..64fe3f0648 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -222,9 +222,9 @@ class Scene3230 : public SceneExt {
 public:
 	SpeakerRocko3230 _rockoSpeaker;
 	SpeakerJocko3230 _jockoSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
+	SceneActor _rocko;
+	SceneActor _jocko;
+	SceneActor _ghoul;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 53e75d2217f51a00277e8cc59aa9086bc1f6aa3e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 18:15:44 -0400
Subject: TSAGE: Renamings for Teal monologue cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 64fe3f0648..7272c47793 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -236,8 +236,8 @@ public:
 	SpeakerTeal3240 _tealSpeaker;
 	SpeakerWebbster3240 _webbsterSpeaker;
 	SpeakerMiranda _mirandaSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
+	SceneActor _teal;
+	SceneActor _webbster;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 51d766208c7d2111eee86c2f2bc7f3b8a9424fc9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 18:18:38 -0400
Subject: TSAGE: Renamings for Ralf/Tomko cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 7272c47793..b0557cf6f4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -248,8 +248,8 @@ class Scene3245 : public SceneExt {
 public:
 	SpeakerRalf3245 _ralfSpeaker;
 	SpeakerTomko3245 _tomkoSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
+	SceneActor _ralf;
+	SceneActor _tomko;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 7bdd047f6a71be642f52dcb0dd99ed905d7ee5bb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 18:24:40 -0400
Subject: TSAGE: Renamings for R2R statis negator room

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index b0557cf6f4..02f9e3a5cd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -273,7 +273,7 @@ public:
 	Door _leftDoor;
 	Door _topDoor;
 	Door _rightDoor;
-	Door _actor4;
+	Door _grate;
 	SceneActor _ghoul1;
 	SceneActor _ghoul2;
 	SceneActor _ghoul3;
-- 
cgit v1.2.3


From e2d893f5560a0d65362c6413754264b2a6713a40 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 18:56:21 -0400
Subject: TSAGE: Renamings for R2R guard post

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 02f9e3a5cd..844702d1cb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -288,7 +288,7 @@ class Scene3255 : public SceneExt {
 public:
 	SceneActor _teal;
 	SceneActor _guard;
-	SceneActor _actor3;
+	SceneActor _door;
 	SceneActor _quinn;
 	SceneActor _ghoul1;
 	SceneActor _ghoul2;
-- 
cgit v1.2.3


From d7d88a25a4350f257c455c1ffc7d325ea915f74e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 19:05:25 -0400
Subject: TSAGE: Renamings for R2R base hall

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 844702d1cb..4d445e8402 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -364,7 +364,7 @@ public:
 	NamedHotspot _emptyCell2;
 	NamedHotspot _securityBeams1;
 	NamedHotspot _securityBeams2;
-	SceneActor _actor1;
+	SceneActor _doorFrame;
 	Door _door;
 	CellExit _cellExit;
 	SequenceManager _sequenceManager;
-- 
cgit v1.2.3


From 6adee124b84a2a5b0ac5fc0418848998f997b013 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 20:23:16 -0400
Subject: TSAGE: Renamings for R2R escape ship landing cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 4d445e8402..9ab621251c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -375,15 +375,15 @@ public:
 
 class Scene3350 : public SceneExt {
 public:
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
-	SceneActor _actor4;
-	SceneActor _actor5;
-	SceneActor _actor6;
-	SceneActor _actor7;
-	SceneActor _actor8;
-	SceneActor _actor9;
+	SceneActor _miranda;
+	SceneActor _seeker;
+	SceneActor _webbster;
+	SceneActor _seatedPeople;
+	SceneActor _ship;
+	SceneActor _landedShip;
+	SceneActor _shipShadow;
+	SceneActor _canopy;
+	SceneActor _shipFront;
 	SequenceManager _sequenceManager;
 	PaletteRotation *_rotation;
 
-- 
cgit v1.2.3


From 7f5aab983cedb5eda62abaa64da590c035b20f2e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 20:41:11 -0400
Subject: TSAGE: Renamings and removoal of unused variable for R2R circular
 walkways

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 9ab621251c..0802a29895 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -437,9 +437,8 @@ public:
 	DownExit _downExit;
 	RightExit _rightExit;
 	SequenceManager _sequenceManager;
-	int _field1488;
+	int _newSceneMode;
 	int _sceneAreas[4];
-	int _field1492;
 
 	Scene3375();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 5b696a003e38cc9982c0ee715842d85e20197bb9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 20:47:02 -0400
Subject: TSAGE: Renaming for R2R corridors

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 0802a29895..188db7e87a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -486,7 +486,7 @@ public:
 	Action1 _action1;
 	SequenceManager _sequenceManager;
 
-	int _field11B2;
+	int _playerStrip;
 
 	Scene3385();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
@@ -528,7 +528,7 @@ public:
 	Action1 _action1;
 	SequenceManager _sequenceManager;
 
-	int _field142E;
+	int _playerStrip;
 
 	Scene3395();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 21a2fc6894ef39dc3ad076b5136a4a4f184dcfd2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 20:51:35 -0400
Subject: TSAGE: Renamings for R2R Teal confrontation scene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 188db7e87a..886fb1b014 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -553,7 +553,7 @@ public:
 	SceneActor _actor7;
 	SceneActor _actor8;
 	SequenceManager _sequenceManager;
-	int16 _field157C;
+	bool _soundFaded;
 
 	Scene3400();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From b7f4da4de66c73ed3904ae27a790fac4cf41fff1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Nov 2013 22:49:47 -0400
Subject: TSAGE: In progress renaming for R2R Flub Maze

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 886fb1b014..fdc83ba982 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -588,11 +588,11 @@ class Scene3500 : public SceneExt {
 		virtual void signal();
 	};
 
-	class Item4 : public NamedHotspot {
+	class DirectionButton : public NamedHotspot {
 	public:
-		int _field34;
+		int _movementId;
 
-		Item4();
+		DirectionButton();
 		virtual void synchronize(Serializer &s);
 
 		virtual bool startAction(CursorType action, Event &event);
@@ -600,8 +600,7 @@ class Scene3500 : public SceneExt {
 
 	class Actor7 : public SceneActor {
 	public:
-		int _fieldA4;
-		int _fieldA6;
+		Common::Point _pos;
 		int _fieldA8;
 		int _fieldAA;
 		int _fieldAC;
@@ -610,10 +609,10 @@ class Scene3500 : public SceneExt {
 		Actor7();
 		virtual void synchronize(Serializer &s);
 
-		void sub109466(int arg1, int arg2, int arg3, int arg4, int arg5);
+		void sub109466(int xp, int yp, int arg3, int arg4, int arg5);
 		void sub1094ED();
 		void sub109663(int arg1);
-		void sub109693(Common::Point Pt);
+		void changePosition(const Common::Point &pt);
 
 		virtual void process(Event &event);
 		virtual bool startAction(CursorType action, Event &event);
@@ -637,10 +636,10 @@ public:
 	NamedHotspot _item1;
 	NamedHotspot _item2;
 	NamedHotspot _item3;
-	Item4 _item4;
-	Item4 _item5;
-	Item4 _item6;
-	Item4 _item7;
+	DirectionButton _pitchDown;
+	DirectionButton _turnLeft;
+	DirectionButton _pitchUp;
+	DirectionButton _turnRight;
 	// Glyph of vessel on top of the maze ui
 	SceneActor _actor1;
 	SceneActor _actor2;
@@ -669,10 +668,10 @@ public:
 	int _field1280;
 	int _field1282;
 	int _field1284;
-	int _field1286;
+	bool _directionChangesEnabled;
 
 	Scene3500();
-	void sub107F71(int arg1);
+	void doMovement(int id);
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
-- 
cgit v1.2.3


From fbd365bb9a9ef683fa839fa5a55a6e15df13259d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 Nov 2013 00:03:46 -0400
Subject: TSAGE: Renaming and unused variable removal from R2R gunpoint
 cutscene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 39 ++++++++++++---------------
 1 file changed, 17 insertions(+), 22 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index fdc83ba982..7345061f99 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -695,7 +695,7 @@ class Scene3600 : public SceneExt {
 		virtual void signal();
 	};
 
-	class Item5 : public NamedHotspot {
+	class LightShaft : public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -711,23 +711,20 @@ public:
 	SpeakerMiranda3600 _mirandaSpeaker;
 	SpeakerTeal3600 _tealSpeaker;
 	SpeakerProtector3600 _protectorSpeaker;
-	NamedHotspot _item1;
-	NamedHotspot _item2;
-	NamedHotspot _item3;
-	NamedHotspot _item4;
-	Item5 _item5;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
-	SceneActor _actor4;
-	SceneActor _actor5;
-	SceneActor _actor6;
-	SceneActor _actor7;
-	SceneActor _actor8;
-	SceneActor _actor9;
-	SceneActor _actor10;
-	SceneActor _actor11;
-	SceneActor _actor12;
+	NamedHotspot _background;
+	NamedHotspot _console;
+	NamedHotspot _tapestry1;
+	NamedHotspot _tapestry2;
+	LightShaft _lightShaft;
+	SceneActor _protector3400;
+	SceneActor _steppingDisk;
+	SceneActor _consoleLights;
+	SceneActor _webbster;
+	SceneActor _teal;
+	SceneActor _door3400;
+	SceneActor _quinn;
+	SceneActor _seeker;
+	SceneActor _miranda;
 	Protector _protector;
 	SequenceManager _sequenceManager1;
 	SequenceManager _sequenceManager2;
@@ -735,10 +732,8 @@ public:
 	SequenceManager _sequenceManager4;
 	ScenePalette _palette1;
 
-	int _field2548;
-	int _field254A;
-	int _field254C;
-	int _field254E;
+	bool _tealDead;
+	bool _lightEntered;
 	bool _ghoulTeleported;
 
 	Scene3600();
-- 
cgit v1.2.3


From 067ffbcb466145534662a223ecc1729001980872 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 Nov 2013 08:05:49 -0500
Subject: TSAGE: Renamings for R2R Teleporting Outside scene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 7345061f99..8067215466 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -754,7 +754,7 @@ public:
 	SceneActor _seeker;
 	SceneActor _miranda;
 	SceneActor _webbster;
-	SceneActor _actor5;
+	SceneActor _teleportPad;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From e38599970080d73792bdfe188d8db49cfb75ceae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 Nov 2013 08:28:28 -0500
Subject: TSAGE: Renamings for R2R desert scene

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 8067215466..40c35179bc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -784,9 +784,9 @@ class Scene3800 : public SceneExt {
 	};
 
 public:
-	SceneObject _object1;
-	SceneObject _object2;
-	SceneActor _actor1;
+	SceneObject _balloon;
+	SceneObject _harness;
+	SceneActor _balloonQuinn;
 	NamedHotspot _background;
 	NorthExit _northExit;
 	EastExit _eastExit;
-- 
cgit v1.2.3


From d36b7045023cb8d9ba2415b402796ee929f2c519 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 Nov 2013 08:54:26 -0500
Subject: TSAGE: Renamings and bugfixes for R2R desert and forest entrance

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_scenes3.h')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 40c35179bc..48236ee300 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -792,7 +792,7 @@ public:
 	EastExit _eastExit;
 	SouthExit _southExit;
 	WestExit _westExit;
-	Rect _rect1;
+	Rect _skylineRect;
 	SequenceManager _sequenceManager1;
 
 	int _desertDirection;
@@ -833,14 +833,14 @@ class Scene3900 : public SceneExt {
 		virtual void changeScene();
 	};
 public:
-	SceneActor _actor1;
-	NamedHotspot _item1;
+	SceneActor _linkedQuinn;
+	NamedHotspot _background;
 	NorthExit _northExit;
 	EastExit _eastExit;
 	SouthExit _southExit;
 	WestExit _westExit;
-	Exit5 _exit5;
-	Rect _rect1;
+	Exit5 _westEnterForest;
+	Rect _skylineRect;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
-- 
cgit v1.2.3