Ticket #8310: patch

File patch, 2.4 KB (added by SF/roever, 16 years ago)

Fix for bug 884568

  • doc/10.tex

    diff -r -u scummvm/doc/10.tex devel/doc/10.tex
    old new  
    4242  \end{tabular}
    4343\item Contributors:\\
    4444  \begin{tabular}{ll}
    45     Andreas Rover        & Broken Sword 1/2 MPEG2 cutscene support\\
     45    Andreas Roever       & Broken Sword 1/2 MPEG2 cutscene support\\
    4646    Quietust             & Sound support for Amiga SCUMM V2 - V3 games\\
    4747    Stuart Caie          & Decoders for Simon 1 Amiga data files\\
    4848    Janne Huttunen       & V3 actor mask support, Dig/FT Smush audio\\
  • sword2/driver/animation.cpp

    Dateien scummvm/scummvm und devel/scummvm sind verschieden.
    diff -r -u scummvm/sword2/driver/animation.cpp devel/sword2/driver/animation.cpp
    old new  
    110110        lutcalcnum = (BITDEPTH + palettes[palnum].end + 2) / (palettes[palnum].end + 2);
    111111#else
    112112        buildLookup();
    113         overlay = (NewGuiColor*)calloc(640 * 400, sizeof(NewGuiColor));
     113        overlay = (NewGuiColor*)calloc(640 * 480, sizeof(NewGuiColor));
    114114        _vm->_system->show_overlay();
    115115#endif
    116116
     
    258258
    259259void AnimationState::plotYUV(NewGuiColor *lut, int width, int height, byte *const *dat) {
    260260
    261         NewGuiColor *ptr = overlay + (400 - height) / 2 * 640 + (640 - width) / 2;
     261        NewGuiColor *ptr = overlay + (480 - height) / 2 * 640 + (640 - width) / 2;
    262262
    263263        int x, y;
    264264
     
    283283}
    284284
    285285void AnimationState::drawTextObject(SpriteInfo *s, uint8 *src) {
    286         NewGuiColor *dst = overlay + RENDERWIDE * (s->y - 40) + s->x;
     286        NewGuiColor *dst = overlay + RENDERWIDE * (s->y) + s->x;
    287287
    288288        // FIXME: These aren't the "right" colours, but look good to me.
    289289
     
    309309}
    310310
    311311void AnimationState::updateDisplay(void) {
    312         _vm->_system->copy_rect_overlay(overlay, 640, 0, 40, 640, 400);
     312        _vm->_system->copy_rect_overlay(overlay, 640, 0, 0, 640, 480);
    313313}
    314314
    315315#endif
  • sword2/driver/render.cpp

    diff -r -u scummvm/sword2/driver/render.cpp devel/sword2/driver/render.cpp
    old new  
    831831
    832832#ifdef BACKEND_8BIT
    833833void Graphics::plotYUV(byte *lut, int width, int height, byte *const *dat) {
    834         byte *buf = _buffer + (40 + (400 - height) / 2) * RENDERWIDE + (640 - width) / 2;
     834        byte *buf = _buffer + ((480 - height) / 2) * RENDERWIDE + (640 - width) / 2;
    835835
    836836        int x, y;
    837837