MOHAWK: Myst: Rewrite the sound code

It now more closely matches the original. Effect sounds are now stopped
when resuming background sounds.

Fixes #9574, Fixes #9920.

1 files changed, 4 insertions, 4 deletions

diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp
index a25023cf39..877c1acd37 100644
--- a/engines/mohawk/console.cpp
+++ b/engines/mohawk/console.cpp
@@ -81,7 +81,7 @@ bool MystConsole::Cmd_ChangeCard(int argc, const char **argv) {
 		return true;
 	}
 
-	_vm->_sound->stopSound();
+	_vm->_sound->stopEffect();
 	_vm->changeToCard((uint16)atoi(argv[1]), kTransitionCopy);
 
 	return false;
@@ -169,7 +169,7 @@ bool MystConsole::Cmd_ChangeStack(int argc, const char **argv) {
 
 	// We need to stop any playing sound when we change the stack
 	// as the next card could continue playing it if it.
-	_vm->_sound->stopSound();
+	_vm->_sound->stopEffect();
 
 	uint16 card = 0;
 	if (argc == 3)
@@ -234,7 +234,7 @@ bool MystConsole::Cmd_PlaySound(int argc, const char **argv) {
 		return true;
 	}
 
-	_vm->_sound->replaceSoundMyst((uint16)atoi(argv[1]));
+	_vm->_sound->playEffect((uint16) atoi(argv[1]));
 
 	return false;
 }
@@ -242,7 +242,7 @@ bool MystConsole::Cmd_PlaySound(int argc, const char **argv) {
 bool MystConsole::Cmd_StopSound(int argc, const char **argv) {
 	debugPrintf("Stopping Sound\n");
 
-	_vm->_sound->stopSound();
+	_vm->_sound->stopEffect();
 
 	return true;
 }