[Scummvm-cvs-logs] SF.net SVN: scummvm:[35585] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 35585
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35585&view=rev
Author:   drmccoy
Date:     2008-12-27 22:48:00 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
Fixing some 16bit graphics

Modified Paths:
--------------
    scummvm/trunk/engines/gob/coktelvideo.cpp
    scummvm/trunk/engines/gob/inter_v6.cpp
    scummvm/trunk/engines/gob/video_v6.cpp

Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-27 22:47:34 UTC (rev 35584)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-27 22:48:00 UTC (rev 35585)
@@ -1549,12 +1549,13 @@
 		uint16 *s = src;
 
 		for (int j = 0; j < width; j++, s++) {
-			byte r = ((*s & 0x7C00) >> 10) << 1;
-			byte g = ((*s & 0x03E0) >>  5) << 1;
-			byte b = ((*s & 0x001F) >>  0) << 1;
+			uint16 data = READ_LE_UINT16(s);
+			byte r = ((data & 0x7C00) >> 10);
+			byte g = ((data & 0x03E0) >>  5);
+			byte b = ((data & 0x001F) >>  0);
 			byte dY, dU, dV;
 
-			Graphics::PaletteLUT::RGB2YUV(r << 2, g << 2, b << 2, dY, dU, dV);
+			Graphics::PaletteLUT::RGB2YUV(r << 3, g << 3, b << 3, dY, dU, dV);
 
 			byte p = dither->dither(dY, dU, dV, j);
 

Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp	2008-12-27 22:47:34 UTC (rev 35584)
+++ scummvm/trunk/engines/gob/inter_v6.cpp	2008-12-27 22:48:00 UTC (rev 35585)
@@ -927,7 +927,7 @@
 
 	if (_gotFirstPalette)
 		_vm->_video->_palLUT->setPalette((const byte *) _vm->_global->_pPaletteDesc->vgaPal,
-				Graphics::PaletteLUT::kPaletteRGB, 6);
+				Graphics::PaletteLUT::kPaletteRGB, 6, 0);
 
 	_gotFirstPalette = true;
 	return false;

Modified: scummvm/trunk/engines/gob/video_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/video_v6.cpp	2008-12-27 22:47:34 UTC (rev 35584)
+++ scummvm/trunk/engines/gob/video_v6.cpp	2008-12-27 22:48:00 UTC (rev 35585)
@@ -105,7 +105,7 @@
 void Video_v6::buildPalLUT() {
 	char text[30];
 
-	_palLUT->setPalette(_ditherPalette, Graphics::PaletteLUT::kPaletteYUV, 8);
+	_palLUT->setPalette(_ditherPalette, Graphics::PaletteLUT::kPaletteYUV, 8, 0);
 
 	for (int i = 0; (i < 64) && !_vm->shouldQuit(); i++) {
 		sprintf(text, "Building palette table: %02d/63", i);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.