Ticket #8051: samsoundhack.diff

File samsoundhack.diff, 885 bytes (added by eriktorbjorn, 18 years ago)

Patch against a September 15 CVS snapshot

  • scummvm/scumm/string.cpp

    diff -ur ScummVM-cvs20020915/scummvm/scumm/string.cpp ScummVM-cvs20020915+hack/scummvm/scumm/string.cpp
    old new  
    173173
    174174                a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24);
    175175                b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24);
    176 //    if (_saveSound != 1)
    177                 _sound->talkSound(a, b, 1, -1);
     176
     177                // Sam & Max uses some sort of wacky sound pre-loading
     178                // mechanism which works by printing empty messages with a
     179                // sound attached to them, usually when entering a new room.
     180                // This phantom menace ends here.
     181       
     182                if (_gameId != GID_SAMNMAX || _vars[9] != 2)
     183                        _sound->talkSound(a, b, 1, -1);
    178184        }
    179185//  warning("unkMessage1(\"%s\")", buffer);
    180186}