TSAGE: Fixes and renaming for R2R forest

1 files changed, 21 insertions, 20 deletions

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 422507883f..819513e7ec 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -520,24 +520,25 @@ class Scene2700 : public SceneExt {
 public:
 	SpeakerQuinn2700 _quinnSpeaker;
 	SpeakerNej2700 _nejSpeaker;
-	NamedHotspot _item1;
-	NamedHotspot _item2;
-	NamedHotspot _item3;
-	NamedHotspot _item4;
-	NamedHotspot _item5;
-	NamedHotspot _item6;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
-	SceneActor _actor4;
-	SceneActor _actor5;
+	NamedHotspot _background;
+	NamedHotspot _ghoulHome1;
+	NamedHotspot _ghoulHome2;
+	NamedHotspot _ghoulHome3;
+	NamedHotspot _ghoulHome4;
+	NamedHotspot _ghoulHome5;
+	SceneActor _nej;
+	SceneActor _ghoulHome6;
+	SceneActor _ghoulHome7;
+	SceneActor _ghoulHome8;
+	SceneActor _ghoulHome9;
 	Action1 _action1;
 	Action2 _action2;
 	Action3 _action3;
 	Action4 _action4;
 	Area1 _area1;
 	Area2 _area2;
-	Rect _rect1, _rect2, _rect3, _rect4, _rect5, _rect6;
+	Rect _walkRect1, _walkRect2, _walkRect3;
+	Rect _walkRect4, _walkRect5, _walkRect6;
 	SequenceManager _sequenceManager;
 	int _field412, _field414, _field416;
 
@@ -589,12 +590,12 @@ class Scene2750 : public SceneExt {
 public:
 	SpeakerQuinn2750 _quinnSpeaker;
 	SpeakerNej2750 _nejSpeaker;
-	NamedHotspot _item1;
-	NamedHotspot _item2;
-	NamedHotspot _item3;
-	NamedHotspot _item4;
-	NamedHotspot _item5;
-	SceneActor _actor1;
+	NamedHotspot _background;
+	NamedHotspot _ghoulHome1;
+	NamedHotspot _ghoulHome2;
+	NamedHotspot _ghoulHome3;
+	NamedHotspot _ghoulHome4;
+	SceneActor _nej;
 	SceneActor _actor2;
 	SceneActor _actor3;
 	SceneActor _actor4;
@@ -631,7 +632,7 @@ class Scene2800 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
-	class Actor1 : public SceneActor {
+	class Guard : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
@@ -652,7 +653,7 @@ public:
 	SpeakerGuard2800 _guardSpeaker;
 	NamedHotspot _item1;
 	Item2 _item2;
-	Actor1 _actor1;
+	Guard _guard;
 	SceneActor _actor2;
 	SceneActor _actor3;
 	SceneObject _object1;