Patch #874510 from roever, fixes BS2 demo cutscene problems (bug #884568)

svn-id: r12761

2 files changed, 5 insertions, 5 deletions

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;