[Scummvm-cvs-logs] scummvm master -> 8f70ee9afc877b22123269669d155e710a467c4b
dreammaster
dreammaster at scummvm.org
Mon Aug 1 14:39:21 CEST 2011
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
97c4dd02a2 TSAGE: Fix parameters in various calls to fadeOut method
d71b38b6de TSAGE: Changed debugging statements from warning() to debug()
10033ca976 TSAGE: Fix for background music to properly fade when leaving Scene #7700
8f70ee9afc TSAGE: Wait for fading sounds to completely fade when changing scenes
Commit: 97c4dd02a2465ecf1a864b0819ecd7d4493b9247
https://github.com/scummvm/scummvm/commit/97c4dd02a2465ecf1a864b0819ecd7d4493b9247
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-01T04:52:30-07:00
Commit Message:
TSAGE: Fix parameters in various calls to fadeOut method
Changed paths:
engines/tsage/ringworld_scenes3.cpp
engines/tsage/ringworld_scenes8.cpp
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 3f9921b..2091447 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -324,7 +324,7 @@ void Scene2000::Action14::signal() {
scene->_stripManager.start(2001, this, scene);
break;
case 6:
- _globals->_soundHandler.fadeOut(0/* was false */);
+ _globals->_soundHandler.fadeOut(NULL);
scene->_object8.setStrip(1);
scene->_object8.setFrame(scene->_object8.getFrameCount());
scene->_object8.animate(ANIM_MODE_6, this);
@@ -786,7 +786,7 @@ void Scene2100::Action9::signal() {
scene->_stripManager.start(6051, this, scene);
break;
case 4:
- scene->_soundHandler.fadeOut(0/* was false */);
+ scene->_soundHandler.fadeOut(NULL);
scene->_object4.setStrip(1);
scene->_object4.setFrame(scene->_object4.getFrameCount());
scene->_object4.animate(ANIM_MODE_6, this);
@@ -1105,7 +1105,7 @@ void Scene2100::Action14::signal() {
scene->_stripManager.start(6009, this, scene);
break;
case 6:
- scene->_soundHandler.fadeOut(0/* was false */);
+ scene->_soundHandler.fadeOut(NULL);
scene->_object4.setStrip(1);
scene->_object4.setFrame(scene->_object4.getFrameCount());
scene->_object4.animate(ANIM_MODE_6, this);
diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index 2b329b9..be79e83 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -2223,7 +2223,7 @@ void Scene7700::signal() {
}
break;
case 7702:
- _soundHandler.fadeOut(0);
+ _soundHandler.fadeOut(NULL);
_globals->_sceneManager.changeScene(7600);
break;
case 7703:
Commit: d71b38b6dec151459dec087ed83a7ab47f62bc1d
https://github.com/scummvm/scummvm/commit/d71b38b6dec151459dec087ed83a7ab47f62bc1d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-01T05:03:18-07:00
Commit Message:
TSAGE: Changed debugging statements from warning() to debug()
Changed paths:
engines/tsage/scenes.cpp
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index b94e95c..f6c2c03 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -45,7 +45,7 @@ SceneManager::~SceneManager() {
}
void SceneManager::setNewScene(int sceneNumber) {
- warning("SetNewScene(%d)", sceneNumber);
+ debug(1, "SetNewScene(%d)", sceneNumber);
_nextSceneNumber = sceneNumber;
}
@@ -146,7 +146,7 @@ void SceneManager::fadeInIfNecessary() {
}
void SceneManager::changeScene(int newSceneNumber) {
- warning("changeScene(%d)", newSceneNumber);
+ debug(1, "changeScene(%d)", newSceneNumber);
// Fade out the scene
ScenePalette scenePalette;
uint32 adjustData = 0;
@@ -296,7 +296,7 @@ void Scene::dispatch() {
}
void Scene::loadScene(int sceneNum) {
- warning("loadScene(%d)", sceneNum);
+ debug(1, "loadScene(%d)", sceneNum);
_screenNumber = sceneNum;
if (_globals->_scenePalette.loadPalette(sceneNum))
_globals->_sceneManager._hasPalette = true;
Commit: 10033ca976feabf365c9378f4156724d76fe64c5
https://github.com/scummvm/scummvm/commit/10033ca976feabf365c9378f4156724d76fe64c5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-01T05:35:32-07:00
Commit Message:
TSAGE: Fix for background music to properly fade when leaving Scene #7700
Changed paths:
engines/tsage/ringworld_scenes8.cpp
diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index be79e83..d0e7491 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -2223,7 +2223,7 @@ void Scene7700::signal() {
}
break;
case 7702:
- _soundHandler.fadeOut(NULL);
+ _globals->_soundHandler.fadeOut(NULL);
_globals->_sceneManager.changeScene(7600);
break;
case 7703:
Commit: 8f70ee9afc877b22123269669d155e710a467c4b
https://github.com/scummvm/scummvm/commit/8f70ee9afc877b22123269669d155e710a467c4b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-01T05:36:21-07:00
Commit Message:
TSAGE: Wait for fading sounds to completely fade when changing scenes
Changed paths:
engines/tsage/scenes.cpp
engines/tsage/sound.cpp
engines/tsage/sound.h
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index f6c2c03..3e23205 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -173,6 +173,11 @@ void SceneManager::changeScene(int newSceneNumber) {
// Blank out the screen
_globals->_screenSurface.fillRect(_globals->_screenSurface.getBounds(), 0);
+ // If there are any fading sounds, wait until fading is complete
+ while (_globals->_soundManager.isFading()) {
+ g_system->delayMillis(10);
+ }
+
// Set the new scene to be loaded
setNewScene(newSceneNumber);
}
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index d054949..1754bd7 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -451,6 +451,22 @@ void SoundManager::_sfProcessFading() {
}
}
+bool SoundManager::isFading() {
+ Common::StackLock slock(sfManager()._serverSuspendedMutex);
+
+ // Loop through any active sounds to see if any are being actively faded
+ Common::List<Sound *>::iterator i = sfManager()._playList.begin();
+ while (i != sfManager()._playList.end()) {
+ Sound *s = *i;
+ ++i;
+
+ if (s->_fadeDest != -1)
+ return true;
+ }
+
+ return false;
+}
+
void SoundManager::_sfUpdateVoiceStructs() {
for (int voiceIndex = 0; voiceIndex < SOUND_ARR_SIZE; ++voiceIndex) {
VoiceTypeStruct *vs = sfManager()._voiceTypeStructPtrs[voiceIndex];
diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
index 702a277..46a29e5 100644
--- a/engines/tsage/sound.h
+++ b/engines/tsage/sound.h
@@ -225,6 +225,7 @@ public:
int getMasterVol() const;
void loadSound(int soundNum, bool showErrors);
void unloadSound(int soundNum);
+ bool isFading();
// _sf methods
static SoundManager &sfManager();
More information about the Scummvm-git-logs
mailing list