From 8b2d85f8e5b30aeb73817894974a4db53588565b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 Jul 2016 19:07:38 -0400
Subject: TITANIC: Figured out remainder of CMovieManager

---
 engines/titanic/sound/sound.cpp         | 2 ++
 engines/titanic/sound/sound_manager.cpp | 2 +-
 engines/titanic/sound/sound_manager.h   | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines/titanic/sound')

diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index dc8d0eeb21..7968a088da 100644
--- a/engines/titanic/sound/sound.cpp
+++ b/engines/titanic/sound/sound.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/sound/sound.h"
 #include "titanic/game_manager.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
@@ -31,6 +32,7 @@ int CSoundItem::fn1() {
 }
 
 CSound::CSound(CGameManager *owner) : _gameManager(owner) {
+	g_vm->_movieManager.setSoundManager(&_soundManager);
 }
 
 void CSound::save(SimpleFile *file) const {
diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp
index fa1e5fb166..05a924f352 100644
--- a/engines/titanic/sound/sound_manager.cpp
+++ b/engines/titanic/sound/sound_manager.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-SoundManager::SoundManager() : _musicPercent(75.0), _speechPercent(75.0),
+CSoundManager::CSoundManager() : _musicPercent(75.0), _speechPercent(75.0),
 	_masterPercent(75.0), _parrotPercent(75.0), _field14(1) {
 }
 
diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h
index 75cf06e931..ac4ac1ef9f 100644
--- a/engines/titanic/sound/sound_manager.h
+++ b/engines/titanic/sound/sound_manager.h
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-class SoundManager {
+class CSoundManager {
 protected:
 	double _musicPercent;
 	double _speechPercent;
@@ -35,8 +35,8 @@ protected:
 	double _parrotPercent;
 	int _field14;
 public:
-	SoundManager();
-	virtual ~SoundManager() {}
+	CSoundManager();
+	virtual ~CSoundManager() {}
 	
 	/**
 	 * Loads a sound
@@ -98,7 +98,7 @@ public:
 	virtual void proc29() {}
 };
 
-class QSoundManager : public SoundManager {
+class QSoundManager : public CSoundManager {
 public:
 	int _field18;
 	int _field1C;
-- 
cgit v1.2.3