[Scummvm-cvs-logs] scummvm master -> 79a3caf389368d6acf82a33e603e85cf28b6580d
dreammaster
dreammaster at scummvm.org
Sun Feb 7 02:46:58 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
79a3caf389 SHERLOCK: RT: Fix crash removing wax cylinders on gramaphone
Commit: 79a3caf389368d6acf82a33e603e85cf28b6580d
https://github.com/scummvm/scummvm/commit/79a3caf389368d6acf82a33e603e85cf28b6580d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-02-06T20:46:25-05:00
Commit Message:
SHERLOCK: RT: Fix crash removing wax cylinders on gramaphone
Changed paths:
engines/sherlock/tattoo/tattoo_talk.cpp
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index a5ada7b..e6b9a96 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -795,7 +795,10 @@ OpcodeReturn TattooTalk::cmdTalkInterruptsDisable(const byte *&str) { error("Dum
// Dummy opcode
OpcodeReturn TattooTalk::cmdTalkInterruptsEnable(const byte *&str) { error("Dummy opcode cmdTalkInterruptsEnable called"); }
-OpcodeReturn TattooTalk::cmdTurnSoundsOff(const byte *&str) { error("TODO: script opcode (cmdTurnSoundsOff)"); }
+OpcodeReturn TattooTalk::cmdTurnSoundsOff(const byte *&str) {
+ _vm->_sound->stopSound();
+ return RET_SUCCESS;
+}
OpcodeReturn TattooTalk::cmdWalkHolmesAndNPCToCAnimation(const byte *&str) {
int npcNum = *++str;
More information about the Scummvm-git-logs
mailing list