added radius and radius2 (squared radius) fields to model structure

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index a3f4a314747395f7e2292626675cbaadee687997..51538971121534d932ea03e58090d99f046d8903 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -1316,8 +1316,6 @@ static void Mod_LoadFaces (lump_t *l)
 
                // force lightmap upload on first time seeing the surface
                out->cached_dlight = true;
-               out->cached_ambient = -1000;
-               out->cached_lightscalebit = -1000;
 
                CalcSurfaceExtents (out);
 
@@ -2462,6 +2460,8 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                mod->yawmaxs[2] = mod->normalmaxs[2];
                mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
                mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
+               mod->radius = modelradius;
+               mod->radius2 = modelradius * modelradius;
                // LordHavoc: check for empty submodels (lacrima.bsp has such a glitch)
                if (mod->normalmins[0] > mod->normalmaxs[0] || mod->normalmins[1] > mod->normalmaxs[1] || mod->normalmins[2] > mod->normalmaxs[2])
                {
@@ -2472,12 +2472,14 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                        VectorClear(mod->yawmaxs);
                        VectorClear(mod->rotatedmins);
                        VectorClear(mod->rotatedmaxs);
+                       mod->radius = 0;
+                       mod->radius2 = 0;
                }
 
                mod->numleafs = bm->visleafs;
 
                mod->Draw = R_DrawBrushModelNormal;
-               mod->DrawShadow = NULL;
+               mod->DrawFakeShadow = NULL;
 
                // LordHavoc: only register submodels if it is the world
                // (prevents bsp models from replacing world submodels)