[Scummvm-cvs-logs] scummvm master -> fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a
dreammaster
dreammaster at scummvm.org
Sat Aug 20 13:34:19 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
472d2ef9a3 TSAGE: Fix memory leak of sound voiceType list
fbf8262ce6 TSAGE: Fix Valgrind issues with loading Scene 50
Commit: 472d2ef9a30e43e4c4f1818da0cfa0122f7a9982
https://github.com/scummvm/scummvm/commit/472d2ef9a30e43e4c4f1818da0cfa0122f7a9982
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-20T04:30:03-07:00
Commit Message:
TSAGE: Fix memory leak of sound voiceType list
Changed paths:
engines/tsage/sound.cpp
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 7c8dc83..0b77628 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -71,6 +71,14 @@ SoundManager::~SoundManager() {
// g_system->getTimerManager()->removeTimerProc(_sfUpdateCallback);
}
+ // Free any allocated voice type structures
+ for (int idx = 0; idx < SOUND_ARR_SIZE; ++idx) {
+ if (sfManager()._voiceTypeStructPtrs[idx]) {
+ delete sfManager()._voiceTypeStructPtrs[idx];
+ sfManager()._voiceTypeStructPtrs[idx] = NULL;
+ }
+ }
+
_soundManager = NULL;
}
Commit: fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a
https://github.com/scummvm/scummvm/commit/fbf8262ce6c7f17a7cfd5ac6e9e4a9f53489870a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-20T04:30:52-07:00
Commit Message:
TSAGE: Fix Valgrind issues with loading Scene 50
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
engines/tsage/core.cpp
engines/tsage/scenes.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index bf9a757..f1b714e 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 7ad2084..42cb1d0 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 c362545..5aeacda 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);
}
More information about the Scummvm-git-logs
mailing list