Ticket #8058: emergency-patch2.diff

File emergency-patch2.diff, 1.7 KB (added by eriktorbjorn, 17 years ago)

Typo-fixed patch

  • scummvm/common/gameDetector.cpp

    diff -ur ScummVM-cvs20020922/scummvm/common/gameDetector.cpp ScummVM-cvs20020922+hack/scummvm/common/gameDetector.cpp
    old new  
    375375
    376376        /* Scumm version 5 */
    377377        {"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA,  5, 0, 16,
    378          GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
     378         GF_SMALL_HEADER | GF_USE_KEY | GF_ADLIB_DEFAULT},
    379379        {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42,
    380380         GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
    381381        {"monkey", "Monkey Island 1", GID_MONKEY, 5, 2, 2,
  • scummvm/scumm/scummvm.cpp

    diff -ur ScummVM-cvs20020922/scummvm/scumm/scummvm.cpp ScummVM-cvs20020922+hack/scummvm/scumm/scummvm.cpp
    old new  
    340340
    341341int Scumm::scummLoop(int delta)
    342342{
     343        static int counter = 0;
     344
    343345#ifndef _WIN32_WCE
    344346        if (_debugger)
    345347                _debugger->on_frame();
     
    378380        _vars[VAR_MOUSE_Y] = mouse.y;
    379381        _vars[VAR_DEBUGMODE] = _debugMode;
    380382
    381         if (_features & GF_AUDIOTRACKS) {
     383        if (_gameId == GID_MONKEY_VGA) {
     384                // FIXME: Is all this really necessary now?
     385                if (delta == 1)
     386                        _vars[VAR_MI1_TIMER]++;
     387                else if (++counter != 2)
     388                        _vars[VAR_MI1_TIMER] += 5;
     389                else {
     390                        counter = 0;
     391                        _vars[VAR_MI1_TIMER] += 6;
     392                }
     393        } else if (_features & GF_AUDIOTRACKS) {
    382394                _vars[VAR_MI1_TIMER] = _sound->readCDTimer();
    383395        } else if (_features & GF_OLD256) {
    384396