From fdabdae325ffcd3f6d19f335e10325a2339bd6be Mon Sep 17 00:00:00 2001
From: Paul Gilbert <dreammaster@scummvm.org>
Date: Wed, 26 Jun 2013 20:41:29 -0400
Subject: [PATCH] TSAGE: Bugfix for starting R2R scene 2000

---
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 17 +++++++++++------
 engines/tsage/ringworld2/ringworld2_scenes2.h   |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 6a030e5b44e..67830766f9b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -630,6 +630,7 @@ void Scene2000::Exit3::changeScene() {
 		break;
 	}
 }
+
 void Scene2000::Exit4::changeScene() {
 	Scene2000 *scene = (Scene2000 *)R2_GLOBALS._sceneManager._scene;
 
@@ -756,19 +757,21 @@ void Scene2000::Exit5::changeScene() {
 	}
 }
 
-void Scene2000::postInit(SceneObjectList *OwnerList) {
-	SceneExt::postInit();
-	loadScene(2000);
-
+Scene2000::Scene2000(): SceneExt() {
 	if (R2_GLOBALS._sceneManager._previousScene != -1) {
 		R2_GLOBALS._v56605[1] = 21;
 		R2_GLOBALS._v56605[2] = 21;
 	}
-	if ((R2_GLOBALS._player._characterScene[R2_GLOBALS._player._characterIndex] != R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex]) && (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 2350)) {
+	if ((R2_GLOBALS._player._characterScene[R2_GLOBALS._player._characterIndex] 
+			!= R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex]) 
+			&& (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 2350)) {
 		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 0;
 	}
-	_exitingFlag = false;
 
+	_exitingFlag = false;
+}
+
+void Scene2000::postInit(SceneObjectList *OwnerList) {
 	_exit1.setDetails(Rect(0, 100, 14, 140), EXITCURSOR_W, 2000);
 	_exit1.setDest(Common::Point(14, 129));
 	_exit2.setDetails(Rect(305, 100, 320, 140), EXITCURSOR_E, 2000);
@@ -917,6 +920,8 @@ void Scene2000::postInit(SceneObjectList *OwnerList) {
 	initPlayer();
 
 	_item1.setDetails(Rect(0, 0, 320, 200), 2000, 0, -1, 23, 1, NULL);
+
+	SceneExt::postInit();
 }
 
 void Scene2000::remove() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 281d1da366c..feceaa15375 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -80,6 +80,7 @@ public:
 	Action1 _action1, _action2, _action3, _action4, _action5;
 	SequenceManager _sequenceManager;
 
+	Scene2000();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
 	virtual void signal();