diff options
author | James Brown | 2004-02-07 15:09:13 +0000 |
---|---|---|
committer | James Brown | 2004-02-07 15:09:13 +0000 |
commit | 91f201af29cff3b731bd84a0f6f10d131b693330 (patch) | |
tree | 42ba9e8f94ea8803e6443a9bf6fbabf44c9212b8 | |
parent | 364277dad0308c13eb4fa1e8882c00469a5a6682 (diff) | |
download | scummvm-rg350-91f201af29cff3b731bd84a0f6f10d131b693330.tar.gz scummvm-rg350-91f201af29cff3b731bd84a0f6f10d131b693330.tar.bz2 scummvm-rg350-91f201af29cff3b731bd84a0f6f10d131b693330.zip |
Patch #874510 from roever, fixes BS2 demo cutscene problems (bug #884568)
svn-id: r12761
-rw-r--r-- | doc/10.tex | 2 | ||||
-rw-r--r-- | sword2/driver/animation.cpp | 8 | ||||
-rw-r--r-- | sword2/driver/render.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/10.tex b/doc/10.tex index 183ca5121a..9c16a22535 100644 --- a/doc/10.tex +++ b/doc/10.tex @@ -42,7 +42,7 @@ \end{tabular} \item Contributors:\\ \begin{tabular}{ll} - Andreas Rover & Broken Sword 1/2 MPEG2 cutscene support\\ + Andreas Roever & Broken Sword 1/2 MPEG2 cutscene support\\ Quietust & Sound support for Amiga SCUMM V2 - V3 games\\ Stuart Caie & Decoders for Simon 1 Amiga data files\\ Janne Huttunen & V3 actor mask support, Dig/FT Smush audio\\ diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index 1b231d5051..71f4effb98 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -110,7 +110,7 @@ bool AnimationState::init(const char *name) { lutcalcnum = (BITDEPTH + palettes[palnum].end + 2) / (palettes[palnum].end + 2); #else buildLookup(); - overlay = (NewGuiColor*)calloc(640 * 400, sizeof(NewGuiColor)); + overlay = (NewGuiColor*)calloc(640 * 480, sizeof(NewGuiColor)); _vm->_system->show_overlay(); #endif @@ -258,7 +258,7 @@ void AnimationState::buildLookup() { void AnimationState::plotYUV(NewGuiColor *lut, int width, int height, byte *const *dat) { - NewGuiColor *ptr = overlay + (400 - height) / 2 * 640 + (640 - width) / 2; + NewGuiColor *ptr = overlay + (480 - height) / 2 * 640 + (640 - width) / 2; int x, y; @@ -283,7 +283,7 @@ void AnimationState::plotYUV(NewGuiColor *lut, int width, int height, byte *cons } void AnimationState::drawTextObject(SpriteInfo *s, uint8 *src) { - NewGuiColor *dst = overlay + RENDERWIDE * (s->y - 40) + s->x; + NewGuiColor *dst = overlay + RENDERWIDE * (s->y) + s->x; // FIXME: These aren't the "right" colours, but look good to me. @@ -309,7 +309,7 @@ void AnimationState::drawTextObject(SpriteInfo *s, uint8 *src) { } void AnimationState::updateDisplay(void) { - _vm->_system->copy_rect_overlay(overlay, 640, 0, 40, 640, 400); + _vm->_system->copy_rect_overlay(overlay, 640, 0, 0, 640, 480); } #endif diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index b467266a08..ce73ed49bd 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -831,7 +831,7 @@ void Graphics::closeBackgroundLayer(void) { #ifdef BACKEND_8BIT void Graphics::plotYUV(byte *lut, int width, int height, byte *const *dat) { - byte *buf = _buffer + (40 + (400 - height) / 2) * RENDERWIDE + (640 - width) / 2; + byte *buf = _buffer + ((480 - height) / 2) * RENDERWIDE + (640 - width) / 2; int x, y; |