[Scummvm-cvs-logs] CVS: scummvm/sky struc.h,1.14,1.15
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Thu Sep 16 00:36:02 CEST 2004
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26544
Modified Files:
struc.h
Log Message:
Made the dataFileHeader struct packed, after discussing it with olki.
Neither of us can verify it, but it should fix bug #1002534.
Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- struc.h 6 Jan 2004 12:45:32 -0000 1.14
+++ struc.h 16 Sep 2004 07:35:01 -0000 1.15
@@ -34,6 +34,10 @@
uint32 textWidth;
};
+#if !defined(__GNUC__)
+#pragma START_PACK_STRUCTS
+#endif
+
struct dataFileHeader {
uint16 flag; // bit 0: set for colour data, clear for not
// bit 1: set for compressed, clear for uncompressed
@@ -48,7 +52,11 @@
int16 s_offset_x;
int16 s_offset_y;
uint16 s_compressed_size;
-};
+} GCC_PACK;
+
+#if !defined(__GNUC__)
+#pragma END_PACK_STRUCTS
+#endif
struct GrafixPtr { // replacement for old grafixProg pointer. More savegame compatible.
uint8 ptrType; // ptr to autoroute / to compact / to turntable
More information about the Scummvm-git-logs
mailing list