From c224d35a432fff7e1d0a6bf5368f7f2e81a45e27 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 3 Sep 2016 10:34:38 -0400 Subject: TITANIC: Identified sound balance usage in the engine --- engines/titanic/game/computer.cpp | 16 ++++++++-------- engines/titanic/game/computer_screen.cpp | 2 +- engines/titanic/game/fan_noises.cpp | 20 ++++++++++---------- engines/titanic/game/fan_noises.h | 2 +- engines/titanic/game/television.cpp | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'engines/titanic/game') diff --git a/engines/titanic/game/computer.cpp b/engines/titanic/game/computer.cpp index 90574997b1..3077b46178 100644 --- a/engines/titanic/game/computer.cpp +++ b/engines/titanic/game/computer.cpp @@ -46,7 +46,7 @@ void CComputer::load(SimpleFile *file) { bool CComputer::ActMsg(CActMsg *msg) { if (_state) { - playSound("a#35.wav", 100, 0, 0); + playSound("a#35.wav"); playMovie(32, 42, 0); if (msg->_action == "CD1") @@ -66,11 +66,11 @@ bool CComputer::ActMsg(CActMsg *msg) { bool CComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (_currentCD == "None") { if (_state) { - playSound("a#35.wav", 100, 0, 0); + playSound("a#35.wav"); playMovie(11, 21, 0); _state = 0; } else { - playSound("a#34.wav", 100, 0, 0); + playSound("a#34.wav"); playMovie(0, 10, 0); _state = 1; } @@ -81,7 +81,7 @@ bool CComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { actMsg.execute(_currentCD); _currentCD = "None"; } else { - playSound("a#34.wav", 100, 0, 0); + playSound("a#34.wav"); playMovie(21, 31, 0); _state = 1; } @@ -92,10 +92,10 @@ bool CComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { bool CComputer::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == 90) { - playSound("a#32.wav", 100, 0, 0); - playSound("a#33.wav", 100, 0, 0); - playSound("a#31.wav", 100, 0, 0); - playSound("a#0.wav", 100, 0, 0); + playSound("a#32.wav"); + playSound("a#33.wav"); + playSound("a#31.wav"); + playSound("a#0.wav"); gotoView("Home.Node 4.E", "_TRACK,3,e-cu,4,E"); } diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp index 0572258cef..9a7ac4b34e 100644 --- a/engines/titanic/game/computer_screen.cpp +++ b/engines/titanic/game/computer_screen.cpp @@ -57,7 +57,7 @@ bool CComputerScreen::ActMsg(CActMsg *msg) { } bool CComputerScreen::MovieEndMsg(CMovieEndMsg *msg) { - playSound("z#47.wav", 100, 0, 0); + playSound("z#47.wav"); addTimer(0, 3000, 0); for (int idx = 0; idx < 10; ++idx) diff --git a/engines/titanic/game/fan_noises.cpp b/engines/titanic/game/fan_noises.cpp index c6e6d203dd..9144f523f4 100644 --- a/engines/titanic/game/fan_noises.cpp +++ b/engines/titanic/game/fan_noises.cpp @@ -34,7 +34,7 @@ BEGIN_MESSAGE_MAP(CFanNoises, CGameObject) END_MESSAGE_MAP() CFanNoises::CFanNoises() : CGameObject(), _state(-1), - _soundHandle(0), _soundPercent(70), _soundV3(-1), _soundSeconds(0), + _soundHandle(0), _soundPercent(70), _soundBalance(0), _soundSeconds(0), _stopSeconds(0), _startFlag(true) { } @@ -43,7 +43,7 @@ void CFanNoises::save(SimpleFile *file, int indent) { file->writeNumberLine(_state, indent); file->writeNumberLine(_soundHandle, indent); file->writeNumberLine(_soundPercent, indent); - file->writeNumberLine(_soundV3, indent); + file->writeNumberLine(_soundBalance, indent); file->writeNumberLine(_soundSeconds, indent); file->writeNumberLine(_stopSeconds, indent); file->writeNumberLine(_startFlag, indent); @@ -56,7 +56,7 @@ void CFanNoises::load(SimpleFile *file) { _state = file->readNumber(); _soundHandle = file->readNumber(); _soundPercent = file->readNumber(); - _soundV3 = file->readNumber(); + _soundBalance = file->readNumber(); _soundSeconds = file->readNumber(); _stopSeconds = file->readNumber(); _startFlag = file->readNumber(); @@ -75,12 +75,12 @@ bool CFanNoises::EnterRoomMsg(CEnterRoomMsg *msg) { switch (_state) { case 1: - _soundHandle = playSound("b#60.wav", 0, _soundV3, true); + _soundHandle = playSound("b#60.wav", 0, _soundBalance, true); setSoundVolume(_soundHandle, _soundPercent, _soundSeconds); _startFlag = true; break; case 2: - _soundHandle = playSound("b#58.wav", 0, _soundV3, true); + _soundHandle = playSound("b#58.wav", 0, _soundBalance, true); setSoundVolume(_soundHandle, _soundPercent, _soundSeconds); _startFlag = true; break; @@ -122,7 +122,7 @@ bool CFanNoises::StatusChangeMsg(CStatusChangeMsg *msg) { switch (oldState) { case 1: case 2: - playSound("b#59.wav", _soundPercent, _soundV3); + playSound("b#59.wav", _soundPercent, _soundBalance); break; default: break; @@ -140,7 +140,7 @@ bool CFanNoises::StatusChangeMsg(CStatusChangeMsg *msg) { switch (oldState) { case 1: case 2: - _soundHandle = playSound("b#60.wav", _soundPercent, _soundV3); + _soundHandle = playSound("b#60.wav", _soundPercent, _soundBalance); break; default: break; @@ -156,7 +156,7 @@ bool CFanNoises::StatusChangeMsg(CStatusChangeMsg *msg) { } if (oldState == 1) { - _soundHandle = playSound("b#58.wav", _soundPercent, _soundV3); + _soundHandle = playSound("b#58.wav", _soundPercent, _soundBalance); } break; @@ -184,13 +184,13 @@ bool CFanNoises::LoadSuccessMsg(CLoadSuccessMsg *msg) { switch (_state) { case 1: - playSound("b#60.wav", 0, _soundV3, true); + playSound("b#60.wav", 0, _soundBalance, true); setSoundVolume(_soundHandle, _soundPercent, _soundSeconds); _startFlag = true; break; case 2: - playSound("b#58.wav", 0, _soundV3, true); + playSound("b#58.wav", 0, _soundBalance, true); setSoundVolume(_soundHandle, _soundPercent, _soundSeconds); _startFlag = true; break; diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h index 56c80c0764..488d42e79e 100644 --- a/engines/titanic/game/fan_noises.h +++ b/engines/titanic/game/fan_noises.h @@ -39,7 +39,7 @@ private: int _state; int _soundHandle; int _soundPercent; - int _soundV3; + int _soundBalance; int _soundSeconds; int _stopSeconds; bool _startFlag; diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp index ba30fbe281..780f92b5ad 100644 --- a/engines/titanic/game/television.cpp +++ b/engines/titanic/game/television.cpp @@ -237,8 +237,8 @@ bool CTelevision::MovieEndMsg(CMovieEndMsg *msg) { } if (_fieldE0 == 3 && compareRoomNameTo("SGTState") && !getPassengerClass()) { - playSound("z#47.wav", 100, 0, 0); - _soundHandle = playSound("b#20.wav", 100, 0, 0); + playSound("z#47.wav"); + _soundHandle = playSound("b#20.wav"); CMagazine *magazine = dynamic_cast(getRoot()->findByName("Magazine")); if (magazine) { -- cgit v1.2.3