From 9d6af45877da86a55d9398f8233213f4d48191fe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Jan 2017 09:29:04 -0500
Subject: TITANIC: Removal of un-used fields to reduce Buildbot warnings

Note there's a lot of preliminary code in the star_control/ folder
for code that still needs to be fully disassembled & implemented.
So for now I've made liberal use of #if 0 blocks to disable fields
that will likely be needed again in the future
---
 engines/titanic/sound/music_room_handler.cpp | 7 ++++++-
 engines/titanic/sound/music_room_handler.h   | 3 ++-
 engines/titanic/sound/music_wave.cpp         | 2 +-
 engines/titanic/sound/music_wave.h           | 1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'engines/titanic/sound')

diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index ca37485eab..a9f4116691 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -28,7 +28,7 @@ namespace Titanic {
 
 CMusicRoomHandler::CMusicRoomHandler(CProjectItem *project, CSoundManager *soundManager) :
 		_project(project), _soundManager(soundManager), _stopWaves(false),
-		_soundHandle(-1), _waveFile(nullptr), _soundVolume(100), _ticks(0),
+		_soundHandle(-1), _waveFile(nullptr), _soundVolume(100),
 		_field108(0) {
 	Common::fill(&_musicWaves[0], &_musicWaves[4], (CMusicWave *)nullptr);
 }
@@ -135,4 +135,9 @@ void CMusicRoomHandler::setMuteControl(MusicControlArea area, int value) {
 		_array1[area]._muteControl = value;
 }
 
+bool CMusicRoomHandler::isBusy() {
+	// TODO: stuff
+	return _field108 > 0;
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/sound/music_room_handler.h b/engines/titanic/sound/music_room_handler.h
index 61b332dc7a..a15ef2d1bc 100644
--- a/engines/titanic/sound/music_room_handler.h
+++ b/engines/titanic/sound/music_room_handler.h
@@ -59,7 +59,6 @@ private:
 	CWaveFile *_waveFile;
 	int _soundHandle;
 	int _soundVolume;
-	uint _ticks;
 	int _field108;
 public:
 	CMusicRoomHandler(CProjectItem *project, CSoundManager *soundManager);
@@ -80,6 +79,8 @@ public:
 	 */
 	bool poll();
 
+	bool isBusy();
+
 	/**
 	 * Flags whether the loaded music waves will be stopped when the
 	 * music handler is stopped
diff --git a/engines/titanic/sound/music_wave.cpp b/engines/titanic/sound/music_wave.cpp
index 6b5b187805..560fdd7513 100644
--- a/engines/titanic/sound/music_wave.cpp
+++ b/engines/titanic/sound/music_wave.cpp
@@ -27,7 +27,7 @@
 namespace Titanic {
 
 CMusicWave::CMusicWave(CProjectItem *project, CSoundManager *soundManager, int index) :
-		_project(project), _soundManager(soundManager) {
+		_soundManager(soundManager) {
 }
 
 void CMusicWave::setSize(uint count) {
diff --git a/engines/titanic/sound/music_wave.h b/engines/titanic/sound/music_wave.h
index b240f4a856..4082a926cf 100644
--- a/engines/titanic/sound/music_wave.h
+++ b/engines/titanic/sound/music_wave.h
@@ -39,7 +39,6 @@ class CMusicWave {
 		CMusicWaveFile() : _waveFile(nullptr), _value(0) {}
 	};
 private:
-	CProjectItem *_project;
 	CSoundManager *_soundManager;
 	Common::Array<CMusicWaveFile> _items;
 private:
-- 
cgit v1.2.3