aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2011-08-20 21:30:52 +1000
committerPaul Gilbert2011-08-20 21:30:52 +1000
commitfbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a (patch)
tree8091188511243fc31a05b3b32280fbe2fce53602 /engines
parent472d2ef9a30e43e4c4f1818da0cfa0122f7a9982 (diff)
downloadscummvm-rg350-fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a.tar.gz
scummvm-rg350-fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a.tar.bz2
scummvm-rg350-fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a.zip
TSAGE: Fix Valgrind issues with loading Scene 50
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes0.cpp6
-rw-r--r--engines/tsage/core.cpp1
-rw-r--r--engines/tsage/scenes.cpp2
3 files changed, 6 insertions, 3 deletions
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);
}