Ticket #8310: patch

doc/10.tex

@@ -42 +42 @@
   \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\\

sword2/driver/animation.cpp

@@ -110 +110 @@
         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 +258 @@
 
 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 +283 @@
 }
 
 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 +309 @@
 }
 
 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

sword2/driver/render.cpp

@@ -831 +831 @@
 
 #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;