fix return value of FS_WhichPack to NOT include the -basedir

[xonotic/darkplaces.git] / bspfile.h

diff --git a/bspfile.h b/bspfile.h
index 0755c03029b8b0a1917ca0252fdcaeb344a49306..77e9dcef27a101b55628956fd25e75de5cd5b3d4 100644 (file)
--- a/bspfile.h
+++ b/bspfile.h
@@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #define BSPVERSION     29
-#define MCBSPVERSION 2
 
 typedef struct lump_s
 {
@@ -57,11 +56,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];
@@ -262,7 +261,7 @@ typedef struct dface_s
        short           texinfo;
 
 // lighting info
-       qbyte           styles[MAXLIGHTMAPS];
+       unsigned char           styles[MAXLIGHTMAPS];
        int                     lightofs;               // start of [numstyles*surfsize] samples
 } dface_t;
 
@@ -288,6 +287,6 @@ typedef struct dleaf_s
        unsigned short          firstmarksurface;
        unsigned short          nummarksurfaces;
 
-       qbyte           ambient_level[NUM_AMBIENTS];
+       unsigned char           ambient_level[NUM_AMBIENTS];
 } dleaf_t;