shithub: hexen

Info  •  Files  •  Log  •  Branches

more attrs need back, and we were calling InitGraphics twice..

--- a/i_system.c

+++ b/i_system.c

@@ -14,7 +14,6 @@

 void I_Init (void)

 {

 	I_InitSound();

-	I_InitGraphics();

 	I_MouseEnable(1);

 }

--- a/xddefs.h

+++ b/xddefs.h

@@ -89,6 +89,9 @@

 #define SPAC_PUSH		4	/* when player/monster pushes line */

 #define SPAC_PCROSS		5	/* when projectile crosses line */

+

+#pragma pack on

+

 typedef	struct

 {

 	short		floorheight;

@@ -98,8 +101,10 @@

 	short		lightlevel;

 	short		special;

 	short		tag;

-} __attribute__((__packed__)) mapsector_t;

+} mapsector_t;

+#pragma pack off

+

 typedef struct

 {

 	short		numsegs;

@@ -165,6 +170,8 @@

 /* ---- Texture definition ---- */

+#pragma pack on

+

 typedef struct

 {

 	short		originx;

@@ -172,7 +179,7 @@

 	short		patch;

 	short		stepdir;

 	short		colormap;

-} __attribute__((__packed__)) mappatch_t;

+} mappatch_t;

 typedef struct

 {

@@ -183,7 +190,7 @@

 	int32_t		columndirectory;	/* OBSOLETE */

 	short		patchcount;

 	mappatch_t	patches[1];

-} __attribute__((__packed__)) maptexture_t;

+} maptexture_t;

 /* ---- Graphics ---- */

@@ -194,7 +201,9 @@

 	byte		topdelta;	/* -1 is the last post in a column */

 	byte		length;

 	/* length data bytes follows */

-} __attribute__((__packed__)) post_t;

+} post_t;

+

+#pragma pack off

 /* column_t is a list of 0 or more post_t, (byte)-1 terminated */

 typedef post_t	column_t;