[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.71,1.72

[Lionel Ulmer]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv29324

Modified Files:
	scumm.h 
Log Message:
Yet another packing fix for the iPAQ (seems that GCC does not 'recurse pack' and only pack the structure on which the attribute is put). Note: maybe the pack on the unions is superfluous, but well, one never knows :-)



Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** scumm.h	8 Mar 2002 17:04:51 -0000	1.71
--- scumm.h	8 Mar 2002 23:05:41 -0000	1.72
***************
*** 122,131 ****
  			uint16 width,height;
  			uint16 numObjects;
! 		} v7;
  		struct {
  			uint16 width,height;
  			uint16 numObjects;
! 		} old;
! 	};
  } GCC_PACK;
  
--- 122,131 ----
  			uint16 width,height;
  			uint16 numObjects;
! 		} GCC_PACK v7;
  		struct {
  			uint16 width,height;
  			uint16 numObjects;
! 		} GCC_PACK old;
! 	} GCC_PACK;
  } GCC_PACK;
  
***************
*** 165,169 ****
  			uint16 walk_y;
  			byte actordir;
! 		} v5;
  
  		struct {
--- 165,169 ----
  			uint16 walk_y;
  			byte actordir;
! 		} GCC_PACK v5;
  
  		struct {
***************
*** 175,179 ****
  			uint16 unk2;
  			byte actordir;
! 		} v6;
  
  		struct {
--- 175,179 ----
  			uint16 unk2;
  			byte actordir;
! 		} GCC_PACK v6;
  
  		struct {
***************
*** 182,188 ****
  			byte parent;
  			byte parentstate;
! 		} v7;
  							
! 	};
  } GCC_PACK;
  
--- 182,188 ----
  			byte parent;
  			byte parentstate;
! 		} GCC_PACK v7;
  							
! 	} GCC_PACK;
  } GCC_PACK;
  
***************
*** 197,202 ****
  			struct {
  				int16 x,y;
! 			} hotspot[15];
! 		} old;
  
  		struct {
--- 197,202 ----
  			struct {
  				int16 x,y;
! 			} GCC_PACK hotspot[15];
! 		} GCC_PACK old;
  
  		struct {
***************
*** 211,217 ****
  			struct {
  				int16 x,y;
! 			} hotspot[15];
! 		} v7;
! 	};
  } GCC_PACK;
  #pragma END_PACK_STRUCTS
--- 211,217 ----
  			struct {
  				int16 x,y;
! 			} GCC_PACK hotspot[15];
! 		} GCC_PACK v7;
! 	} GCC_PACK;
  } GCC_PACK;
  #pragma END_PACK_STRUCTS