From d2843da22402a2fd1465310d63316c17783d2f83 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 Apr 2011 23:57:52 +1000
Subject: TSAGE: Switched the startup scene from Scene #30 to Scene #1000
 (Title Screen)

---
 engines/tsage/core.cpp              | 4 ++--
 engines/tsage/ringworld_scenes2.cpp | 3 +--
 engines/tsage/scenes.cpp            | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c550b603d7..c3e47af4e4 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3365,8 +3365,8 @@ void SceneHandler::postInit(SceneObjectList *OwnerList) {
 	_globals->_inventory._scanner._sceneNumber = 1;
 	_globals->_inventory._ring._sceneNumber = 1;
 
-	// Currently hardcoded for first game room. Should be scene 1000 for title screen
-	_globals->_sceneManager.setNewScene(30);	
+	// Switch to the title screen
+	_globals->_sceneManager.setNewScene(1000);	
 }
 
 void SceneHandler::process(Event &event) {
diff --git a/engines/tsage/ringworld_scenes2.cpp b/engines/tsage/ringworld_scenes2.cpp
index 3573f40af2..65b676885a 100644
--- a/engines/tsage/ringworld_scenes2.cpp
+++ b/engines/tsage/ringworld_scenes2.cpp
@@ -253,6 +253,7 @@ void Scene1000::Action3::zoom(bool up) {
 void Scene1000::postInit(SceneObjectList *OwnerList) {
 	Scene::postInit();
 	setZoomPercents(0, 100, 200, 100);
+	loadScene(1000);
 
 	if (_globals->_sceneManager._previousScene == 2000) {
 		setZoomPercents(150, 10, 180, 100);
@@ -304,8 +305,6 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
 
 		setAction(&_action3);
 	}
-
-	loadScene(1000);
 }
 
 /*--------------------------------------------------------------------------
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index ad6d1f9620..5cd4fb7f4b 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -232,7 +232,6 @@ Scene::Scene(): _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
 }
 
 Scene::~Scene() {
-	// TODO: Delete the obj11C object
 }
 
 void Scene::synchronise(Serialiser &s) {
-- 
cgit v1.2.3