[Scummvm-cvs-logs] CVS: residual bitmap.cpp,1.29,1.30 resource.cpp,1.21,1.22

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17837

Modified Files:
	bitmap.cpp resource.cpp 
Log Message:
added dummy things, maybe needed someday

Index: bitmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- bitmap.cpp	1 Jan 2005 12:27:55 -0000	1.29
+++ bitmap.cpp	3 Jan 2005 20:49:49 -0000	1.30
@@ -25,8 +25,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#define BITMAP_TEXTURE_SIZE 256
-
 static void decompress_codec3(const char *compressed, char *result);
 
 Bitmap::Bitmap(const char *filename, const char *data, int len) :
@@ -36,10 +34,19 @@
 		error("Invalid magic loading bitmap\n");
 
 	int codec = READ_LE_UINT32(data + 8);
+//	_paletteIncluded = READ_LE_UINT32(data + 12);
 	_numImages = READ_LE_UINT32(data + 16);
 	_x = READ_LE_UINT32(data + 20);
 	_y = READ_LE_UINT32(data + 24);
+//	_transparentColor = READ_LE_UINT32(data + 28);
 	_format = READ_LE_UINT32(data + 32);
+//	_numBits = READ_LE_UINT32(data + 36);
+//	_blueBits = READ_LE_UINT32(data + 40);
+//	_greenBits = READ_LE_UINT32(data + 44);
+//	_redBits = READ_LE_UINT32(data + 48);
+//	_blueShift = READ_LE_UINT32(data + 52);
+//	_greenShift = READ_LE_UINT32(data + 56);
+//	_redShift = READ_LE_UINT32(data + 60);
 	_width = READ_LE_UINT32(data + 128);
 	_height = READ_LE_UINT32(data + 132);
 	_currImage = 1;

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- resource.cpp	1 Jan 2005 21:07:52 -0000	1.21
+++ resource.cpp	3 Jan 2005 20:49:49 -0000	1.22
@@ -148,7 +148,7 @@
 	Block *b = getFileBlock(filename);
 	if (b == NULL) {	// Grim sometimes asks for non-existant bitmaps (eg, ha_overhead)
 		warning("Could not find bitmap %s\n", filename);
-	return NULL;
+		return NULL;
 	}
 
 	Bitmap *result = new Bitmap(filename, b->data(), b->len());