Ticket #8051: samsoundhack.diff

scummvm/scumm/string.cpp

@@ -173 +173 @@
 
                 a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24);
                 b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24);
-//    if (_saveSound != 1)
-                _sound->talkSound(a, b, 1, -1);
+
+                // Sam & Max uses some sort of wacky sound pre-loading
+                // mechanism which works by printing empty messages with a
+                // sound attached to them, usually when entering a new room.
+                // This phantom menace ends here.
+        
+                if (_gameId != GID_SAMNMAX || _vars[9] != 2)
+                        _sound->talkSound(a, b, 1, -1);
         }
 //  warning("unkMessage1(\"%s\")", buffer);
 }