X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=bspfile.h;h=77e9dcef27a101b55628956fd25e75de5cd5b3d4;hb=ce1f098cd683f58c4d99bb1f53182f6f66c3f30c;hp=48c83219d7ba53ed5328bf2ccb1f7c932bde62a9;hpb=e24d834dcbcc61f28fdf0e2c1ba75693d9e23ed1;p=xonotic%2Fdarkplaces.git

diff --git a/bspfile.h b/bspfile.h
index 48c83219..77e9dcef 100644
--- a/bspfile.h
+++ b/bspfile.h
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
-#define	MAX_MAP_HULLS		4
+#define	MAX_MAP_HULLS		16		// was 4
 #define	MAX_MAP_LEAFS		65536	// was 8192
 
 // key / value pair sizes
@@ -31,9 +31,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #define BSPVERSION	29
-#define	TOOLVERSION	2
 
-typedef struct
+typedef struct lump_s
 {
 	int		fileofs, filelen;
 } lump_t;
@@ -55,7 +54,14 @@ typedef struct
 #define	LUMP_MODELS		14
 #define	HEADER_LUMPS	15
 
-typedef struct
+typedef struct hullinfo_s
+{
+	int			filehulls;
+	float		hullsizes[MAX_MAP_HULLS][2][3];
+} hullinfo_t;
+
+// WARNING: this struct does NOT match q1bsp's disk format because MAX_MAP_HULLS has been changed by Sajt's MCBSP code, this struct is only being used in memory as a result
+typedef struct dmodel_s
 {
 	float		mins[3], maxs[3];
 	float		origin[3];
@@ -64,13 +70,13 @@ typedef struct
 	int			firstface, numfaces;
 } dmodel_t;
 
-typedef struct
+typedef struct dheader_s
 {
 	int			version;
 	lump_t		lumps[HEADER_LUMPS];
 } dheader_t;
 
-typedef struct
+typedef struct dmiptexlump_s
 {
 	int			nummiptex;
 	int			dataofs[4];		// [nummiptex]
@@ -85,7 +91,7 @@ typedef struct miptex_s
 } miptex_t;
 
 
-typedef struct
+typedef struct dvertex_s
 {
 	float	point[3];
 } dvertex_t;
@@ -101,7 +107,7 @@ typedef struct
 #define	PLANE_ANYY		4
 #define	PLANE_ANYZ		5
 
-typedef struct
+typedef struct dplane_s
 {
 	float	normal[3];
 	float	dist;
@@ -179,6 +185,10 @@ typedef struct
 #define SUPERCONTENTS_SKY			0x00000010
 #define SUPERCONTENTS_BODY			0x00000020
 #define SUPERCONTENTS_CORPSE		0x00000040
+#define SUPERCONTENTS_NODROP		0x00000080
+#define SUPERCONTENTS_PLAYERCLIP	0x00000100
+#define SUPERCONTENTS_MONSTERCLIP	0x00000200
+#define SUPERCONTENTS_DONOTENTER	0x00000400
 #define SUPERCONTENTS_LIQUIDSMASK	(SUPERCONTENTS_LAVA | SUPERCONTENTS_SLIME | SUPERCONTENTS_WATER)
 
 /*
@@ -199,7 +209,6 @@ typedef struct
 #define SUPERCONTENTS_LADDER		0x00000000
 #define SUPERCONTENTS_MONSTER		0x00000000
 #define SUPERCONTENTS_MONSTERCLIP	0x00000000
-#define SUPERCONTENTS_NODROP		0x00000000
 #define SUPERCONTENTS_PLAYERCLIP	0x00000000
 #define SUPERCONTENTS_TELEPORTER	0x00000000
 #define SUPERCONTENTS_TRANSLUCENT	0x00000000
@@ -208,7 +217,7 @@ typedef struct
 */
 
 
-typedef struct
+typedef struct dnode_s
 {
 	int			planenum;
 	short		children[2];	// negative numbers are -(leafs+1), not nodes
@@ -218,14 +227,14 @@ typedef struct
 	unsigned short	numfaces;	// counting both sides
 } dnode_t;
 
-typedef struct
+typedef struct dclipnode_s
 {
 	int			planenum;
 	short		children[2];	// negative numbers are contents
 } dclipnode_t;
 
 
-typedef struct
+typedef struct texinfo_s
 {
 	float		vecs[2][4];		// [s/t][xyz offset]
 	int			miptex;
@@ -235,13 +244,13 @@ typedef struct
 
 // note that edge 0 is never used, because negative edge nums are used for
 // counterclockwise use of the edge in a face
-typedef struct
+typedef struct dedge_s
 {
 	unsigned short	v[2];		// vertex numbers
 } dedge_t;
 
 #define	MAXLIGHTMAPS	4
-typedef struct
+typedef struct dface_s
 {
 	// LordHavoc: changed from short to unsigned short for q2 support
 	unsigned short	planenum;
@@ -252,7 +261,7 @@ typedef struct
 	short		texinfo;
 
 // lighting info
-	qbyte		styles[MAXLIGHTMAPS];
+	unsigned char		styles[MAXLIGHTMAPS];
 	int			lightofs;		// start of [numstyles*surfsize] samples
 } dface_t;
 
@@ -267,7 +276,7 @@ typedef struct
 
 // leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas
 // all other leafs need visibility info
-typedef struct
+typedef struct dleaf_s
 {
 	int			contents;
 	int			visofs;				// -1 = no visibility info
@@ -278,6 +287,6 @@ typedef struct
 	unsigned short		firstmarksurface;
 	unsigned short		nummarksurfaces;
 
-	qbyte		ambient_level[NUM_AMBIENTS];
+	unsigned char		ambient_level[NUM_AMBIENTS];
 } dleaf_t;