aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/sound.cpp
diff options
context:
space:
mode:
authorStrangerke2013-03-20 08:10:28 +0100
committerStrangerke2013-03-20 08:10:28 +0100
commit73b01f20af4100d10b459c2589e3188cec7deb1f (patch)
treeebe8b962bbfdedd39b3102593a4502e59e6f1ea6 /engines/hopkins/sound.cpp
parent848841772f765b7b8a990d1dd1237d6189f23aaf (diff)
downloadscummvm-rg350-73b01f20af4100d10b459c2589e3188cec7deb1f.tar.gz
scummvm-rg350-73b01f20af4100d10b459c2589e3188cec7deb1f.tar.bz2
scummvm-rg350-73b01f20af4100d10b459c2589e3188cec7deb1f.zip
HOPKINS: Remove setParent() from TalkManager
Diffstat (limited to 'engines/hopkins/sound.cpp')
-rw-r--r--engines/hopkins/sound.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 600ecba0b1..b64430fae2 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -184,7 +184,9 @@ Audio::AudioStream *makeTwaStream(Common::String name, Common::SeekableReadStrea
return new TwaAudioStream(name, stream);
}
-SoundManager::SoundManager() {
+SoundManager::SoundManager(HopkinsEngine *vm) {
+ _vm = vm;
+
_specialSoundNum = 0;
_soundVolume = 0;
_voiceVolume = 0;
@@ -215,11 +217,6 @@ SoundManager::~SoundManager() {
_modPlayingFl = false;
}
-void SoundManager::setParent(HopkinsEngine *vm) {
- _vm = vm;
- _specialSoundNum = 0;
-}
-
void SoundManager::checkSoundEnd() {
if (!_soundOffFl && _soundFl) {
if (!checkVoiceStatus(1)) {