fix a few typos in comments

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index b2c4e513648b2e7d931a9451b2d23fc4b6685604..9380a58e2a771d4e36589906a0b5c6b038410a06 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -107,14 +107,12 @@ void CL_ClearState(void)
        cl.mviewzoom[0] = cl.mviewzoom[1] = 1;
 
        cl.num_entities = 0;
-       cl.num_csqcentities = 0;        //[515]: csqc
        cl.num_static_entities = 0;
        cl.num_temp_entities = 0;
        cl.num_brushmodel_entities = 0;
 
        // tweak these if the game runs out
        cl.max_entities = 256;
-       cl.max_csqcentities = 256;      //[515]: csqc
        cl.max_static_entities = 256;
        cl.max_temp_entities = 512;
        cl.max_effects = 256;
@@ -138,9 +136,7 @@ void CL_ClearState(void)
        cl.num_beams = 0;
 
        cl.entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_entities * sizeof(entity_t));
-       cl.csqcentities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t));      //[515]: csqc
        cl.entities_active = (unsigned char *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(unsigned char));
-       cl.csqcentities_active = (unsigned char *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(unsigned char));      //[515]: csqc
        cl.static_entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_static_entities * sizeof(entity_t));
        cl.temp_entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_temp_entities * sizeof(entity_t));
        cl.effects = (cl_effect_t *)Mem_Alloc(cls.levelmempool, cl.max_effects * sizeof(cl_effect_t));
@@ -158,14 +154,6 @@ void CL_ClearState(void)
                cl.entities[i].state_current = defaultstate;
        }
 
-       for (i = 0;i < cl.max_csqcentities;i++)
-       {
-               cl.csqcentities[i].state_baseline = defaultstate;       //[515]: csqc
-               cl.csqcentities[i].state_previous = defaultstate;       //[515]: csqc
-               cl.csqcentities[i].state_current = defaultstate;        //[515]: csqc
-               cl.csqcentities[i].state_current.number = -i;
-       }
-
        if (gamemode == GAME_NEXUIZ)
        {
                VectorSet(cl.playerstandmins, -16, -16, -24);
@@ -275,32 +263,6 @@ void CL_ExpandEntities(int num)
        }
 }
 
-void CL_ExpandCSQCEntities(int num)
-{
-       int i, oldmaxentities;
-       entity_t *oldentities;
-       if (num >= cl.max_csqcentities)
-       {
-               if (!cl.csqcentities)
-                       Sys_Error("CL_ExpandCSQCEntities: cl.csqcentities not initialized\n");
-               if (num >= MAX_EDICTS)
-                       Host_Error("CL_ExpandCSQCEntities: num %i >= %i\n", num, MAX_EDICTS);
-               oldmaxentities = cl.max_csqcentities;
-               oldentities = cl.csqcentities;
-               cl.max_csqcentities = (num & ~255) + 256;
-               cl.csqcentities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t));
-               memcpy(cl.csqcentities, oldentities, oldmaxentities * sizeof(entity_t));
-               Mem_Free(oldentities);
-               for (i = oldmaxentities;i < cl.max_csqcentities;i++)
-               {
-                       cl.csqcentities[i].state_baseline = defaultstate;
-                       cl.csqcentities[i].state_previous = defaultstate;
-                       cl.csqcentities[i].state_current = defaultstate;
-                       cl.csqcentities[i].state_current.number = -i;
-               }
-       }
-}
-
 void CL_VM_ShutDown (void);
 /*
 =====================
@@ -936,8 +898,6 @@ void CL_UpdateNetworkEntity(entity_t *e)
        // model setup and some modelflags
        if(e->state_current.modelindex < MAX_MODELS)
                e->render.model = cl.model_precache[e->state_current.modelindex];
-       else
-               e->render.model = cl.csqc_model_precache[65536-e->state_current.modelindex];
        if (e->render.model)
        {
                // if model is alias or this is a tenebrae-like dlight, reverse pitch direction
@@ -1262,6 +1222,7 @@ static void CL_RelinkStaticEntities(void)
                // if the model was not loaded when the static entity was created we
                // need to re-fetch the model pointer
                e->render.model = cl.model_precache[e->state_baseline.modelindex];
+               CL_UpdateRenderEntity(&e->render);
                // transparent stuff can't be lit during the opaque stage
                if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1)
                        e->render.flags |= RENDER_TRANSPARENT;
@@ -1346,7 +1307,7 @@ static void CL_RelinkEffects(void)
                                if(e->modelindex < MAX_MODELS)
                                        ent->render.model = cl.model_precache[e->modelindex];
                                else
-                                       ent->render.model = cl.csqc_model_precache[65536-e->modelindex];
+                                       ent->render.model = cl.csqc_model_precache[-(e->modelindex+1)];
                                ent->render.frame = ent->render.frame2;
                                ent->render.colormap = -1; // no special coloring
                                ent->render.alpha = 1;