X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=bspfile.h;h=648b294d4d978abe79a58a7ceb7a87fc4204a81d;hp=f01c46e1aac8cd93a476b30f84e9972d9d0a02de;hb=f575e5ad7f9eab64e89b714e75ff5dd92e49f373;hpb=336f89e49a7ad642ce57e6c35c5241239d77dcca

diff --git a/bspfile.h b/bspfile.h
index f01c46e1..648b294d 100644
--- a/bspfile.h
+++ b/bspfile.h
@@ -19,21 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
-#define	MAX_MAP_HULLS		4
-#define	MAX_MAP_LEAFS		65536	// was 8192
-
-// key / value pair sizes
-
-#define	MAX_KEY		32
-#define	MAX_VALUE	1024
+#define MAX_MAP_HULLS 16 // Q1BSP has 4, Hexen2 Q1BSP has 8, MCBSP has 16
 
 //=============================================================================
 
 
 #define BSPVERSION	29
-#define	TOOLVERSION	2
 
-typedef struct
+typedef struct lump_s
 {
 	int		fileofs, filelen;
 } lump_t;
@@ -55,7 +48,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 +64,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 +85,7 @@ typedef struct miptex_s
 } miptex_t;
 
 
-typedef struct
+typedef struct dvertex_s
 {
 	float	point[3];
 } dvertex_t;
@@ -101,7 +101,7 @@ typedef struct
 #define	PLANE_ANYY		4
 #define	PLANE_ANYZ		5
 
-typedef struct
+typedef struct dplane_s
 {
 	float	normal[3];
 	float	dist;
@@ -163,6 +163,7 @@ typedef struct
 #define CONTENTSQ3_JUMPPAD			0x00080000 // hint for Q3's bots
 #define CONTENTSQ3_CLUSTERPORTAL	0x00100000 // hint for Q3's bots
 #define CONTENTSQ3_DONOTENTER		0x00200000 // hint for Q3's bots
+#define CONTENTSQ3_BOTCLIP			0x00400000 // hint for Q3's bots
 #define CONTENTSQ3_ORIGIN			0x01000000 // used by origin brushes to indicate origin of bmodel (removed by map compiler)
 #define CONTENTSQ3_BODY				0x02000000 // used by bbox entities (should never be on a brush)
 #define CONTENTSQ3_CORPSE			0x04000000 // used by dead bodies (SOLID_CORPSE in darkplaces)
@@ -183,7 +184,19 @@ typedef struct
 #define SUPERCONTENTS_PLAYERCLIP	0x00000100
 #define SUPERCONTENTS_MONSTERCLIP	0x00000200
 #define SUPERCONTENTS_DONOTENTER	0x00000400
+#define SUPERCONTENTS_BOTCLIP		0x00000800
+#define SUPERCONTENTS_OPAQUE		0x00001000
+// TODO: is there any reason to define:
+//   fog?
+//   areaportal?
+//   teleporter?
+//   jumppad?
+//   clusterportal?
+//   detail?         (div0) no, game code should not be allowed to differentiate between structural and detail
+//   structural?     (div0) no, game code should not be allowed to differentiate between structural and detail
+//   trigger?        (div0) no, as these are always solid anyway, and that's all that matters for trigger brushes
 #define SUPERCONTENTS_LIQUIDSMASK	(SUPERCONTENTS_LAVA | SUPERCONTENTS_SLIME | SUPERCONTENTS_WATER)
+#define SUPERCONTENTS_VISBLOCKERMASK	SUPERCONTENTS_OPAQUE
 
 /*
 #define SUPERCONTENTS_DEADMONSTER	0x00000000
@@ -211,7 +224,7 @@ typedef struct
 */
 
 
-typedef struct
+typedef struct dnode_s
 {
 	int			planenum;
 	short		children[2];	// negative numbers are -(leafs+1), not nodes
@@ -221,14 +234,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;
@@ -238,13 +251,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;
@@ -255,7 +268,7 @@ typedef struct
 	short		texinfo;
 
 // lighting info
-	qbyte		styles[MAXLIGHTMAPS];
+	unsigned char		styles[MAXLIGHTMAPS];
 	int			lightofs;		// start of [numstyles*surfsize] samples
 } dface_t;
 
@@ -270,7 +283,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
@@ -281,6 +294,6 @@ typedef struct
 	unsigned short		firstmarksurface;
 	unsigned short		nummarksurfaces;
 
-	qbyte		ambient_level[NUM_AMBIENTS];
+	unsigned char		ambient_level[NUM_AMBIENTS];
 } dleaf_t;