support Q3BSP version 47 loading (format now written by q3map2 :( )

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8499 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_brush.c b/model_brush.c
index 545be9100d627ab793ff0f08b3422503c9da2bf7..284e4d683e0f49b675796a2445a5e556715caba8 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -5652,7 +5652,7 @@ void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node)
 
 void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
-       int i, j, numshadowmeshtriangles;
+       int i, j, numshadowmeshtriangles, lumps;
        q3dheader_t *header;
        float corner[3], yawradius, modelradius;
        msurface_t *surface;
@@ -5666,7 +5666,7 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
        header = (q3dheader_t *)buffer;
 
        i = LittleLong(header->version);
-       if (i != Q3BSPVERSION && i != Q3BSPVERSION_IG)
+       if (i != Q3BSPVERSION && i != Q3BSPVERSION_IG && i != Q3BSPVERSION_LIVE)
                Host_Error("Mod_Q3BSP_Load: %s has wrong version number (%i, should be %i)", mod->name, i, Q3BSPVERSION);
        mod->brush.ishlbsp = false;
        if (loadmodel->isworldmodel)
@@ -5701,15 +5701,21 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
        // swap all the lumps
        header->ident = LittleLong(header->ident);
        header->version = LittleLong(header->version);
-       for (i = 0;i < Q3HEADER_LUMPS;i++)
+       lumps = (header->version == Q3BSPVERSION_LIVE) ? Q3HEADER_LUMPS_LIVE : Q3HEADER_LUMPS;
+       for (i = 0;i < lumps;i++)
        {
                header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs);
                header->lumps[i].filelen = LittleLong(header->lumps[i].filelen);
        }
+       for (i = lumps;i < Q3HEADER_LUMPS_MAX;i++)
+       {
+               header->lumps[i].fileofs = 0;
+               header->lumps[i].filelen = 0;
+       }
 
        mod->brush.qw_md4sum = 0;
        mod->brush.qw_md4sum2 = 0;
-       for (i = 0;i < Q3HEADER_LUMPS;i++)
+       for (i = 0;i < lumps;i++)
        {
                if (i == Q3LUMP_ENTITIES)
                        continue;
@@ -5865,7 +5871,7 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 void Mod_IBSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
        int i = LittleLong(((int *)buffer)[1]);
-       if (i == Q3BSPVERSION || i == Q3BSPVERSION_IG)
+       if (i == Q3BSPVERSION || i == Q3BSPVERSION_IG || i == Q3BSPVERSION_LIVE)
                Mod_Q3BSP_Load(mod,buffer, bufferend);
        else if (i == Q2BSPVERSION)
                Mod_Q2BSP_Load(mod,buffer, bufferend);

diff --git a/model_brush.h b/model_brush.h
index 854faf509730ac5742c3513fa97a15a55da7bbe2..652c91394f7033eb637efd3a075dc01eeda4f9bb 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -393,6 +393,7 @@ typedef struct q2darea_s
 //Q3 bsp stuff
 
 #define Q3BSPVERSION   46
+#define Q3BSPVERSION_LIVE 47
 #define Q3BSPVERSION_IG        48
 
 #define        Q3LUMP_ENTITIES         0 // entities to spawn (used by server and client)
@@ -413,12 +414,15 @@ typedef struct q2darea_s
 #define        Q3LUMP_LIGHTGRID        15 // lighting as a voxel grid (used by rendering)
 #define        Q3LUMP_PVS                      16 // potentially visible set; bit[clusters][clusters] (used by rendering)
 #define        Q3HEADER_LUMPS          17
+#define        Q3LUMP_ADVERTISEMENTS 17 // quake live stuff written by zeroradiant's q3map2 (ignored by DP)
+#define        Q3HEADER_LUMPS_LIVE     18
+#define        Q3HEADER_LUMPS_MAX      18
 
 typedef struct q3dheader_s
 {
        int                     ident;
        int                     version;
-       lump_t          lumps[Q3HEADER_LUMPS];
+       lump_t          lumps[Q3HEADER_LUMPS_MAX];
 } q3dheader_t;
 
 typedef struct q3dtexture_s