Ticket #8030: dissolve2.diff

File dissolve2.diff, 1.7 KB (added by eriktorbjorn, 19 years ago)

Patch against an August 28 CVS snapshot (after scummvm-new was removed)

  • scummvm/scumm/gfx.cpp

    diff -ur ScummVM-cvs20020828/scummvm/scumm/gfx.cpp ScummVM-cvs20020828+hack/scummvm/scumm/gfx.cpp
    old new  
    674674                transitionEffect(effect - 1);
    675675                break;
    676676        case 128:
    677                 dissolveEffect(8, 8);
     677                unkScreenEffect6();
    678678                break;
    679679        case 130:
    680680                unkScreenEffect1();
     
    731731                transitionEffect(a - 1);
    732732                break;
    733733        case 128:
    734                 dissolveEffect(8, 8);
     734                unkScreenEffect6();
    735735                break;
    736736        case 129:
    737737                // Just blit screen 0 to the display (i.e. display will be black)
     
    20882088        }
    20892089}
    20902090
     2091void Scumm::unkScreenEffect6() {
     2092        if (_gameId == GID_LOOM256)
     2093                dissolveEffect(1, 1);
     2094        else
     2095                dissolveEffect(8, 4);
     2096}
     2097
    20912098void Scumm::unkScreenEffect5(int a) {
    20922099        // unkScreenEffect5(0), which is used by FOA during the opening
    20932100        // cutscene when Indy opens the small statue, has been replaced by
  • scummvm/scumm/scumm.h

    diff -ur ScummVM-cvs20020828/scummvm/scumm/scumm.h ScummVM-cvs20020828+hack/scummvm/scumm/scumm.h
    old new  
    833833        void unkScreenEffect3();
    834834        void unkScreenEffect4();
    835835        void unkScreenEffect5(int a);
     836        void unkScreenEffect6();
    836837        void transitionEffect(int a);           // former unkScreenEffect7
    837         void dissolveEffect(int width, int height);     // former unkScreenEffect5(0) and unkScreenEffect6
     838        void dissolveEffect(int width, int height);     // former unkScreenEffect5(0) and used by unkScreenEffect6()
    838839
    839840        void decompressBomp(byte *dst, byte *src, int w, int h);
    840841        uint _shakeFrame;