[Scummvm-cvs-logs] CVS: scummvm/saga image.cpp,1.16,1.17 image.h,1.6,1.7 xref.txt,1.14,1.15

[Torbjörn Andersson]

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

Modified Files:
	image.cpp image.h xref.txt 
Log Message:
Removed unknown part of IMAGE_HEADER struct since it wasn't used in the
original code either. (Apparently it was reserved for future use.)

I think the only remaining data structure with unknown members now is
ANIMATION_HEADER. Of course, there's probably a lot that isn't implemented
at all, too...


Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- image.cpp	27 Oct 2004 21:32:27 -0000	1.16
+++ image.cpp	2 Nov 2004 08:37:14 -0000	1.17
@@ -68,8 +68,9 @@
 
 	hdr.width = readS.readUint16LE();
 	hdr.height = readS.readUint16LE();
-	hdr.unknown4 = readS.readUint16LE();
-	hdr.unknown6 = readS.readUint16LE();
+	// The next four bytes of the image header aren't used.
+	readS.readUint16LE();
+	readS.readUint16LE();
 
 	RLE_data_ptr = image_data + SAGA_IMAGE_DATA_OFFSET;
 	RLE_data_len = image_size - SAGA_IMAGE_DATA_OFFSET;

Index: image.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- image.h	27 Oct 2004 21:32:27 -0000	1.6
+++ image.h	2 Nov 2004 08:37:14 -0000	1.7
@@ -37,8 +37,6 @@
 struct IMAGE_HEADER {
 	int width;
 	int height;
-	int unknown4;
-	int unknown6;
 };
 
 } // End of namespace Saga

Index: xref.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/xref.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- xref.txt	31 Oct 2004 13:51:45 -0000	1.14
+++ xref.txt	2 Nov 2004 08:37:14 -0000	1.15
@@ -109,3 +109,9 @@
  tilePlatform.highestPixel ISO_METATILE_ENTRY.highest_pixel
  tilePlatform.vBits        ISO_METATILE_ENTRY.v_bits
  tilePlatform.uBits        ISO_METATILE_ENTRY.u_bits
+
+Resource.h
+==========
+ PicHeader.width           IMAGE_HEADER.width
+ PicHeader.height          IMAGE_HEADER.height
+