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

diff --git a/bspfile.h b/bspfile.h
index 35137c31..648b294d 100644
--- a/bspfile.h
+++ b/bspfile.h
@@ -19,19 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
-#define	MAX_MAP_HULLS		16		// was 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 MCBSPVERSION 2
 
 typedef struct lump_s
 {
@@ -57,11 +50,11 @@ typedef struct lump_s
 
 typedef struct hullinfo_s
 {
-	int			numhulls;
 	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];
@@ -170,6 +163,7 @@ typedef struct dplane_s
 #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)
@@ -190,7 +184,19 @@ typedef struct dplane_s
 #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