From fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 20 Aug 2011 21:30:52 +1000
Subject: TSAGE: Fix Valgrind issues with loading Scene 50

---
 engines/tsage/blue_force/blueforce_scenes0.cpp | 6 +++---
 engines/tsage/core.cpp                         | 1 +
 engines/tsage/scenes.cpp                       | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index bf9a7572ae..f1b714ec6c 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -404,13 +404,13 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
 		break;
 	}
 
-	loadBackground(xp - 160, 0);
-	tooltip->update();
-
 	_timer.set(240, this);
 	_sceneBounds.center(xp, SCREEN_HEIGHT / 2);
 	loadScene(55);
 	_sceneMode = 2;
+
+	loadBackground(xp - 160, 0);
+	tooltip->update();
 }
 
 void Scene50::remove() {
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 7ad2084985..42cb1d039f 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1718,6 +1718,7 @@ SceneObject::SceneObject() : SceneHotspot() {
 	_sceneRegionId = 0;
 	_percent = 100;
 	_flags |= OBJFLAG_PANES;
+	_priority = 0;
 
 	_frameChange = 0;
 	_visage = 0;
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index c3625452de..5aeacda6fe 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -38,6 +38,7 @@ SceneManager::SceneManager() {
 	_scrollerRect = Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 	_saver->addListener(this);
 	_objectCount = 0;
+	_loadMode = 0;
 }
 
 SceneManager::~SceneManager() {
@@ -257,6 +258,7 @@ void SceneManager::listenerSynchronize(Serializer &s) {
 Scene::Scene() : _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
 			_backgroundBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) {
 	_sceneMode = 0;
+	_activeScreenNumber = 0;
 	_oldSceneBounds = Rect(4000, 4000, 4100, 4100);
 	Common::set_to(&_zoomPercents[0], &_zoomPercents[256], 0);
 }
-- 
cgit v1.2.3