AVALANCHE: Remove some STUBs, add calls to stopSound()

6 files changed, 10 insertions, 15 deletions

diff --git a/engines/avalanche/celer.cpp b/engines/avalanche/celer.cpp
index 37a01ed6a0..0ebd846955 100644
--- a/engines/avalanche/celer.cpp
+++ b/engines/avalanche/celer.cpp
@@ -259,7 +259,7 @@ void Celer::updateBackgroundSprites() {
 			_vm->_sound->playNote(_vm->_gyro->kNotes[_vm->_gyro->_nextBell], 2);
 			break;
 		case 2:
-			//nosound();
+			_vm->_sound->stopSound();
 			break;
 		}
 	}
diff --git a/engines/avalanche/closing.cpp b/engines/avalanche/closing.cpp
index df53bc38b9..900000d8bc 100644
--- a/engines/avalanche/closing.cpp
+++ b/engines/avalanche/closing.cpp
@@ -68,13 +68,12 @@ void Closing::exitGame() {
 		"ignore", "stare at", "shriek at", "frighten", "quieten"
 	};
 
-	Common::String result;
-
-	//nosound();
-	warning("STUB: Closing::exitGame()");
+	_vm->_sound->stopSound();
 
 	getScreen(kScreenNagScreen);
-	result = nouns[_vm->_rnd->getRandomNumber(12)] + " will " + verbs[_vm->_rnd->getRandomNumber(12)] + " you";
+	byte nounId = _vm->_rnd->getRandomNumber(12);
+	byte verbId = _vm->_rnd->getRandomNumber(12);
+	Common::String result = nouns[nounId] + " will " + verbs[verbId] + " you";
 	putIn(result, 1628);
 	showScreen(); // No halt- it's already set up.
 }
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index 0206d0ab9c..2f3845249d 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -340,7 +340,7 @@ void Lucerna::findPeople(byte room) {
 }
 
 void Lucerna::exitRoom(byte x) {
-	//nosound();
+	_vm->_sound->stopSound();
 	_vm->_celer->forgetBackgroundSprites();
 	_vm->_gyro->_seeScroll = true;  // This stops the trippancy system working over the length of this procedure.
 
@@ -365,7 +365,6 @@ void Lucerna::exitRoom(byte x) {
 	}
 
 	_vm->_gyro->_interrogation = 0; // Leaving the room cancels all the questions automatically.
-
 	_vm->_gyro->_seeScroll = false; // Now it can work again!
 
 	_vm->_gyro->_lastRoom = _vm->_gyro->_room;
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index aa7cba7a82..2d899dad78 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -60,10 +60,7 @@ void HeadType::draw() {
 void HeadType::highlight() {
 	CursorMan.showMouse(false);
 
-	//nosound();
-	//setactivepage(cp);
-	warning("STUB: Dropdown::headytpe::highlight()");
-
+	_dr->_vm->_sound->stopSound();
 	_dr->drawMenuText(_xpos, 1, _trigger, _title, true, true);
 
 	_dr->_activeMenuItem._left = _xpos;
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index 043921150d..8df46355a0 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -592,9 +592,10 @@ void Scrolls::solidify(byte n) {
 
 void Scrolls::callScrollDriver() {
 //	bool was_virtual; // Was the mouse cursor virtual on entry to this proc?
-	//nosound();
 	warning("STUB: Scrolls::calldrivers()");
 
+	_vm->_sound->stopSound();
+
 	setReadyLight(0);
 	_vm->_gyro->_scReturn = false;
 	bool mouthnext = false;
diff --git a/engines/avalanche/sound.h b/engines/avalanche/sound.h
index a982e98ced..da2ece3b14 100644
--- a/engines/avalanche/sound.h
+++ b/engines/avalanche/sound.h
@@ -40,13 +40,12 @@ public:
 	void click();
 	void blip();
 	void syncVolume();
+	void stopSound();
 
 private:
 	AvalancheEngine *_vm;
 	Audio::PCSpeaker *_speakerStream;
 	Audio::SoundHandle _speakerHandle;
-
-	void stopSound();
 };
 
 } // End of namespace Avalanche