TSAGE: Fix sounds not getting registered in Globals::_sounds

This fixes a problem in Scene 20 where the scene wasn't ending after a sound fade
scummvm · Jun 22, 2011 · f67f069 · f67f069
1 parent 7ef6bea
commit f67f069
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
@@ -302,7 +302,8 @@ void SoundManager::addToPlayList(Sound *sound) {
 }
 
 void SoundManager::removeFromPlayList(Sound *sound) {
-	_sfRemoveFromPlayList(sound);
+	if (_soundManager)
+		_sfRemoveFromPlayList(sound);
 }
 
 bool SoundManager::isOnPlayList(Sound *sound) {
@@ -2246,6 +2247,13 @@ int Sound::_soFindSound(VoiceTypeStruct *vtStruct, int channelNum) {
 ASound::ASound(): EventHandler() {
 	_action = NULL;
 	_cueValue = -1;
+	if (_globals)
+		_globals->_sounds.push_back(this);
+}
+
+ASound::~ASound() {
+	if (_globals)
+		_globals->_sounds.remove(this);
 }
 
 void ASound::synchronize(Serializer &s) {

diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
@@ -361,6 +361,7 @@ class ASound: public EventHandler {
 	int _cueValue;
 
 	ASound();
+	~ASound();
 	virtual void synchronize(Serializer &s);
 	virtual void dispatch();