[Scummvm-cvs-logs] CVS: scummvm/sky struc.h,1.14,1.14.2.1
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Fri Sep 17 06:19:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.255,2.256 script_v72he.cpp,2.101,2.102 script_v80he.cpp,2.28,2.29 script_v90he.cpp,2.37,2.38
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.287,1.288 actor.h,1.64,1.65 akos.cpp,1.173,1.174 gfx.cpp,2.304,2.305 gfx.h,1.68,1.69 palette.cpp,2.16,2.17 script_v7he.cpp,2.93,2.94 scumm.cpp,1.207,1.208 scumm.h,1.481,1.482
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24905
Modified Files:
Tag: branch-0-6-0
struc.h
Log Message:
Backported the fix - we hope! - for bug #1002534
Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- struc.h 6 Jan 2004 12:45:32 -0000 1.14
+++ struc.h 17 Sep 2004 13:18:04 -0000 1.14.2.1
@@ -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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.255,2.256 script_v72he.cpp,2.101,2.102 script_v80he.cpp,2.28,2.29 script_v90he.cpp,2.37,2.38
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.287,1.288 actor.h,1.64,1.65 akos.cpp,1.173,1.174 gfx.cpp,2.304,2.305 gfx.h,1.68,1.69 palette.cpp,2.16,2.17 script_v7he.cpp,2.93,2.94 scumm.cpp,1.207,1.208 scumm.h,1.481,1.482
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list