changed cl_brushmodel_entities array from entity_render_t * to int, to fix a crash...

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

diff --git a/cl_collision.c b/cl_collision.c
index a5168dd93379764751910ac2472ac52f556d3986..d014ca360ab6944248ac86a8552a4bd541369e51 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -69,7 +69,7 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                // look for embedded bmodels
                for (n = 0;n < cl_num_brushmodel_entities;n++)
                {
-                       ent = cl_brushmodel_entities[n];
+                       ent = &cl_entities[cl_brushmodel_entities[n]].render;
                        if (!BoxesOverlap(tracemins, tracemaxs, ent->mins, ent->maxs))
                                continue;
 

diff --git a/cl_main.c b/cl_main.c
index e463e8efe26c2b829ac3c4944f4b213eb257bf8a..afb593abeba801b4827d2ff8975080598d3ba5af 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -85,7 +85,7 @@ cl_effect_t *cl_effects;
 beam_t *cl_beams;
 dlight_t *cl_dlights;
 lightstyle_t *cl_lightstyle;
-entity_render_t **cl_brushmodel_entities;
+int *cl_brushmodel_entities;
 
 int cl_num_entities;
 int cl_num_static_entities;
@@ -148,7 +148,7 @@ void CL_ClearState(void)
        cl_beams = Mem_Alloc(cl_mempool, cl_max_beams * sizeof(beam_t));
        cl_dlights = Mem_Alloc(cl_mempool, cl_max_dlights * sizeof(dlight_t));
        cl_lightstyle = Mem_Alloc(cl_mempool, cl_max_lightstyle * sizeof(lightstyle_t));
-       cl_brushmodel_entities = Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(entity_render_t *));
+       cl_brushmodel_entities = Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(int));
 
        // LordHavoc: have to set up the baseline info for alpha and other stuff
        for (i = 0;i < cl_max_entities;i++)
@@ -650,7 +650,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        }
                        // transfer certain model flags to effects
                        e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE);
-                       if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e - cl_entities)
+                       if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e->state_current.number)
                                VectorScale(e->render.colormod, 2, e->render.colormod);
                }
 
@@ -858,7 +858,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                {
                        //dlightmatrix = e->render.matrix;
                        // hack to make glowing player light shine on their gun
-                       //if ((e - cl_entities) == cl.viewentity/* && !chase_active.integer*/)
+                       //if (e->state_current.number == cl.viewentity/* && !chase_active.integer*/)
                        //      dlightmatrix.m[2][3] += 30;
                        CL_AllocDlight(&e->render, &e->render.matrix, dlightradius, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                }
@@ -885,7 +885,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite)
                        e->render.effects |= EF_ADDITIVE;
                // player model is only shown with chase_active on
-               if (e - cl_entities == cl.viewentity)
+               if (e->state_current.number == cl.viewentity)
                        e->render.flags |= RENDER_EXTERIORMODEL;
                // transparent stuff can't be lit during the opaque stage
                if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1)
@@ -899,15 +899,15 @@ void CL_LinkNetworkEntity(entity_t *e)
                 && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cl.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
                        e->render.flags |= RENDER_SHADOW;
                // as soon as player is known we can call V_CalcRefDef
-               if ((e - cl_entities) == cl.viewentity)
+               if (e->state_current.number == cl.viewentity)
                        V_CalcRefdef();
                if (e->render.model && e->render.model->name[0] == '*' && e->render.model->TraceBox)
-                       cl_brushmodel_entities[cl_num_brushmodel_entities++] = &e->render;
+                       cl_brushmodel_entities[cl_num_brushmodel_entities++] = e->state_current.number;
                // don't show entities with no modelindex (note: this still shows
                // entities which have a modelindex that resolved to a NULL model)
                if (e->render.model && !(e->render.effects & EF_NODRAW) && r_refdef.numentities < r_refdef.maxentities)
                        r_refdef.entities[r_refdef.numentities++] = &e->render;
-               //if (cl.viewentity && e - cl_entities == cl.viewentity)
+               //if (cl.viewentity && e->state_current.number == cl.viewentity)
                //      Matrix4x4_Print(&e->render.matrix);
        }
 }
@@ -915,7 +915,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 void CL_RelinkWorld(void)
 {
        entity_t *ent = &cl_entities[0];
-       cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render;
+       cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0;
        // FIXME: this should be done at load
        Matrix4x4_CreateIdentity(&ent->render.matrix);
        Matrix4x4_CreateIdentity(&ent->render.inversematrix);

diff --git a/client.h b/client.h
index a1cb0b22d5e2e8274f84fbf380167f54e2a20da7..93a35e1ce72ea829dcfa9702ea7f280aaa94963b 100644 (file)
--- a/client.h
+++ b/client.h
@@ -644,7 +644,7 @@ extern entity_t *cl_entities;
 extern qbyte *cl_entities_active;
 extern entity_t *cl_static_entities;
 extern entity_t *cl_temp_entities;
-extern entity_render_t **cl_brushmodel_entities;
+extern int *cl_brushmodel_entities;
 extern cl_effect_t *cl_effects;
 extern beam_t *cl_beams;
 extern dlight_t *cl_dlights;

diff --git a/gl_rsurf.c b/gl_rsurf.c
index fc0ebd63d55576125e6e7948f6f4743db5ebca5b..e62b5689ae810f1bc84ea6402814d9303bc3cd94 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -272,7 +272,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
        // look for embedded bmodels
        for (n = 0;n < cl_num_brushmodel_entities;n++)
        {
-               ent = cl_brushmodel_entities[n];
+               ent = &cl_entities[cl_brushmodel_entities[n]].render;
                model = ent->model;
                if (model && model->name[0] == '*')
                {