Ticket #8035: largo.diff

File largo.diff, 897 bytes (added by eriktorbjorn, 18 years ago)

Patch against a September 3 CVS snapshot

  • scummvm/scumm/script_v1.cpp

    diff -ur ScummVM-cvs20020903/scummvm/scumm/script_v1.cpp ScummVM-cvs20020903+hack/scummvm/scumm/script_v1.cpp
    old new  
    14551455
    14561456void Scumm::o5_isEqual()
    14571457{
    1458         int16 a = readVar(fetchScriptWord());
    1459         int16 b = getVarOrDirectWord(0x80);
     1458        int16 a, b;
     1459        int var;
     1460
     1461        var = fetchScriptWord();
     1462        a = readVar(var);
     1463        b = getVarOrDirectWord(0x80);
     1464
     1465        // HACK: See bug report #602348. The sound effects for Largo's screams
     1466        // are only played on type 5 soundcards. However, there is at least one
     1467        // other sound effect (the bartender spitting) which is only played on
     1468        // type 3 soundcards.
     1469
     1470        if (_gameId == GID_MONKEY2 && var == VAR_SOUNDCARD && b == 5)
     1471                b = a;
     1472
    14601473        if (b == a)
    14611474                ignoreScriptWord();
    14621475        else