From 2f3831d12b54150295e57354bb81487de35af8a7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 27 Feb 2011 16:29:30 +1100
Subject: TSAGE: Minor bugfixes for Scene 90 (Shipyard Entrance)

---
 engines/tsage/ringworld_logic.cpp   |  4 ++--
 engines/tsage/ringworld_scenes1.cpp |  7 ++++---
 engines/tsage/ringworld_scenes1.h   | 13 +++----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 86d128677c..caa01b6909 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -47,9 +47,9 @@ Scene *SceneFactory::createScene(int sceneNumber) {
 	case 50: return new Scene50();
 	// Flycycle controls
 	case 60: return new Scene60();
-	//
+	// Shipyard Entrance
 	case 90: return new Scene90();
-	//
+	// Ship Close-up
 	case 95: return new Scene95();
 	// Title screen
 	case 1000: return new Scene1000();
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 30ef599269..f79f495b33 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -2399,7 +2399,7 @@ void Scene60::process(Event &event) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 90
+ * Scene 90 - Shipyard Entrance
  *
  *--------------------------------------------------------------------------*/
 
@@ -2520,7 +2520,7 @@ void Scene90::Object2::doAction(int action) {
 		scene->_object6.postInit();
 		scene->_object6.setVisage(90);
 		scene->_object6.setStrip(6);
-		scene->_object6.setPosition(Common::Point(210, 184));
+		scene->_object6.setPosition(Common::Point(184, 210));
 		scene->_object6.flag100();
 
 		scene->_sceneMode = 91;
@@ -2610,6 +2610,7 @@ void Scene90::postInit(SceneObjectList *OwnerList) {
 	_object2.setVisage(90);
 	_object2.animate(ANIM_MODE_1, NULL);
 	_object2.setPosition(Common::Point(315, 185));
+	_object2._strip = 2;
 	_globals->_sceneItems.push_back(&_object2);
 
 	_object3.postInit();
@@ -2657,7 +2658,7 @@ void Scene90::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 95 - 
+ * Scene 95 - Ship Close-up
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index 46694efd97..4cc7948c43 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -438,14 +438,6 @@ class Scene90: public Scene {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object3: public SceneObject {
-	public:
-		virtual void doAction(int action);
-	};
-	class Object4: public SceneObject {
-	public:
-		virtual void doAction(int action);
-	};
 public:
 	SequenceManager _sequenceManager;
 	SpeakerSText _speakerSText;
@@ -453,8 +445,9 @@ public:
 	SpeakerQL _speakerQL;
 	SpeakerSR _speakerSR;
 	SpeakerMText _speakerMText;
-	Action _action1;
-	SceneObject _object1, _object2;
+	Action1 _action1;
+	Object1 _object1;
+	Object2 _object2;
 	DisplayObject _object3, _object4, _object5;
 	SceneObject _object6;
 	DisplayHotspot _item1, _item2, _item3;
-- 
cgit v1.2.3