- the fourth.

src/doomdata.h

@@ -71,19 +71,19 @@ enum
 // A single Vertex.
 struct mapvertex_t
 {
-	short x, y;
+	int16_t x, y;
 };
 
 // A SideDef, defining the visual appearance of a wall,
 // by setting textures and offsets.
 struct mapsidedef_t
 {
-	short	textureoffset;
-	short	rowoffset;
+	int16_t	textureoffset;
+	int16_t	rowoffset;
 	char	toptexture[8];
 	char	bottomtexture[8];
 	char	midtexture[8];
-	short	sector;	// Front sector, towards viewer.
+	int16_t	sector;	// Front sector, towards viewer.
 };
 
 struct intmapsidedef_t
@@ -97,24 +97,24 @@ struct intmapsidedef_t
 // A LineDef, as used for editing, and as input to the BSP builder.
 struct maplinedef_t
 {
-	WORD	v1;
-	WORD	v2;
-	WORD	flags;
-	short	special;
-	short	tag;
-	WORD	sidenum[2];	// sidenum[1] will be -1 if one sided
+	uint16_t	v1;
+	uint16_t	v2;
+	uint16_t	flags;
+	int16_t		special;
+	int16_t		tag;
+	uint16_t	sidenum[2];	// sidenum[1] will be -1 if one sided
 
 } ;
 
 // [RH] Hexen-compatible LineDef.
 struct maplinedef2_t
 {
-	WORD	v1;
-	WORD	v2;
-	WORD	flags;
-	BYTE	special;
-	BYTE	args[5];
-	WORD	sidenum[2];
+	uint16_t	v1;
+	uint16_t	v2;
+	uint16_t	flags;
+	uint8_t	special;
+	uint8_t	args[5];
+	uint16_t	sidenum[2];
 } ;
 
 
@@ -221,26 +221,26 @@ static inline int GET_SPAC (int flags)
 // Sector definition, from editing
 struct mapsector_t
 {
-	short	floorheight;
-	short	ceilingheight;
+	int16_t	floorheight;
+	int16_t	ceilingheight;
 	char	floorpic[8];
 	char	ceilingpic[8];
-	short	lightlevel;
-	short	special;
-	short	tag;
+	int16_t	lightlevel;
+	int16_t	special;
+	int16_t	tag;
 };
 
 // SubSector, as generated by BSP
 struct mapsubsector_t
 {
-	WORD	numsegs;
-	WORD	firstseg;	// index of first one, segs are stored sequentially
+	uint16_t	numsegs;
+	uint16_t	firstseg;	// index of first one, segs are stored sequentially
 };
 
 #pragma pack(1)
 struct mapsubsector4_t
 {
-	WORD	numsegs;
+	uint16_t	numsegs;
 	DWORD	firstseg;	// index of first one, segs are stored sequentially
 };
 #pragma pack()
@@ -249,10 +249,10 @@ struct mapsubsector4_t
 // using partition lines selected by BSP builder.
 struct mapseg_t
 {
-	WORD	v1;
-	WORD	v2;
+	uint16_t	v1;
+	uint16_t	v2;
 	SWORD	angle;
-	WORD	linedef;
+	uint16_t	linedef;
 	SWORD	side;
 	SWORD	offset;
 
@@ -265,7 +265,7 @@ struct mapseg4_t
 	int32_t v1;
 	int32_t v2;
 	SWORD angle;
-	WORD linedef;
+	uint16_t linedef;
 	SWORD side;
 	SWORD offset;
 
@@ -290,7 +290,7 @@ struct mapnode_t
 	SWORD 	bbox[2][4];	// bounding box for each child
 	// If NF_SUBSECTOR is or'ed in, it's a subsector,
 	// else it's a node of another subtree.
-	WORD 	children[2];
+	uint16_t 	children[2];
 
 	DWORD Child(int num) { return LittleShort(children[num]); }
 };
@@ -334,9 +334,9 @@ struct mapthinghexen_t
 	SWORD		z;
 	SWORD		angle;
 	SWORD		type;
-	WORD		flags;
-	BYTE		special;
-	BYTE		args[5];
+	uint16_t		flags;
+	uint8_t		special;
+	uint8_t		args[5];
 };
 
 struct FDoomEdEntry;
@@ -346,10 +346,10 @@ struct FMapThing
 {
 	int			thingid;
 	DVector3	pos;
-	short		angle;
-	WORD		SkillFilter;
-	WORD		ClassFilter;
-	short		EdNum;
+	int16_t		angle;
+	uint16_t		SkillFilter;
+	uint16_t		ClassFilter;
+	int16_t		EdNum;
 	FDoomEdEntry *info;
 	DWORD		flags;
 	int			special;
@@ -361,8 +361,8 @@ struct FMapThing
 	DVector2	Scale;
 	double		Health;
 	int			score;
-	short		pitch;
-	short		roll;
+	int16_t		pitch;
+	int16_t		roll;
 	DWORD		RenderStyle;
 	int			FloatbobPhase;
 };
@@ -426,7 +426,7 @@ enum EMapThingFlags
 struct FPlayerStart
 {
 	DVector3 pos;
-	short angle, type;
+	int16_t angle, type;
 
 	FPlayerStart() { }
 	FPlayerStart(const FMapThing *mthing, int pnum)