[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.16,1.17 render.cpp,1.55,1.56

James Brown ender at users.sourceforge.net
Sat Feb 7 07:13:02 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5607/sword2/driver

Modified Files:
	animation.cpp render.cpp 
Log Message:
Patch #874510 from roever, fixes BS2 demo cutscene problems (bug #884568)


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- animation.cpp	5 Feb 2004 14:19:06 -0000	1.16
+++ animation.cpp	7 Feb 2004 15:09:13 -0000	1.17
@@ -110,7 +110,7 @@
 	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::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::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::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

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- render.cpp	5 Feb 2004 14:19:07 -0000	1.55
+++ render.cpp	7 Feb 2004 15:09:13 -0000	1.56
@@ -831,7 +831,7 @@
 
 #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;
 





More information about the Scummvm-git-logs mailing list