some cleanup of Mod_Alias_GetMesh_Vertex3f

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index b78ec29b01c309e1e6a36ad0b59292ef312c8ffe..22acc719e757b6e6a0850b787265f085d88ca8d2 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -239,7 +239,7 @@ void CL_ExpandCSQCEntities(int num)
                oldmaxentities = cl.max_csqcentities;
                oldentities = cl.csqcentities;
                cl.max_csqcentities = (num & ~255) + 256;
-               cl.csqcentities = Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t));
+               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++)
@@ -664,7 +664,7 @@ void CL_UpdateLights(void)
                l = (i-1) % cl.lightstyle[j].length;
                k = cl.lightstyle[j].map[k] - 'a';
                l = cl.lightstyle[j].map[l] - 'a';
-               r_refdef.lightstylevalue[j] = ((k*frac)+(l*(1-frac)))*22;
+               r_refdef.lightstylevalue[j] = (unsigned short)(((k*frac)+(l*(1-frac)))*22);
        }
 }
 
@@ -1287,7 +1287,7 @@ static void CL_RelinkEffects(void)
                if (e->active)
                {
                        frame = (cl.time - e->starttime) * e->framerate + e->startframe;
-                       intframe = frame;
+                       intframe = (int)frame;
                        if (intframe < 0 || intframe >= e->endframe)
                        {
                                memset(e, 0, sizeof(*e));
@@ -1488,6 +1488,7 @@ void CL_LerpPlayer(float frac)
 
 void CSQC_RelinkAllEntities (int drawmask)
 {
+       cl.num_brushmodel_entities = 0;
        CL_RelinkNetworkEntities(drawmask);
        if(drawmask & ENTMASK_ENGINE)
        {
@@ -1526,7 +1527,6 @@ int CL_ReadFromServer(void)
        r_refdef.extraupdate = !r_speeds.integer;
        r_refdef.numentities = 0;
        r_refdef.viewentitymatrix = identitymatrix;
-       cl.num_brushmodel_entities = 0;
 
        if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
@@ -1541,6 +1541,7 @@ int CL_ReadFromServer(void)
                CL_ClientMovement_Replay();
                if(!csqc_loaded)        //[515]: csqc
                {
+                       cl.num_brushmodel_entities = 0;
                        CL_RelinkNetworkEntities(65535);
 
                        // move particles