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

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index f61696a0d94bd80f722eb86cec7729214226b39a..284e4d683e0f49b675796a2445a5e556715caba8 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -1411,7 +1411,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
                // copy name, but only up to 16 characters
                // (the output buffer can hold more than this, but the input buffer is
                //  only 16)
-               for (j = 0;dmiptex->name[j] && j < 16;j++)
+               for (j = 0;j < 16 && dmiptex->name[j];j++)
                        name[j] = dmiptex->name[j];
                name[j] = 0;
 
@@ -1500,9 +1500,9 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
                        }
                        else
                        {
-                               skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
+                               skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
                                if (!skinframe)
-                                       skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
+                                       skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
                                if (!skinframe)
                                {
                                        // did not find external texture, load it from the bsp or wad3
@@ -1519,7 +1519,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
                                                {
                                                        tx->width = image_width;
                                                        tx->height = image_height;
-                                                       skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), pixels, image_width, image_height);
+                                                       skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), pixels, image_width, image_height);
                                                }
                                                if (freepixels)
                                                        Mem_Free(freepixels);
@@ -4225,7 +4225,7 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
                return;
 
        for (i = 0;i < count;i++, in++, out++)
-               Mod_LoadTextureFromQ3Shader(out, out->name, true, true, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
+               Mod_LoadTextureFromQ3Shader(out, out->name, true, true, TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
 }
 
 static void Mod_Q3BSP_LoadPlanes(lump_t *l)
@@ -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);