rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...
[xonotic/darkplaces.git] / cl_main.c
index 56a5a77..73d7adc 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -25,35 +25,62 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // references them even when on a unix system.
 
 // these two are not intended to be set directly
-cvar_t cl_name = {"_cl_name", "player", true};
-cvar_t cl_color = {"_cl_color", "0", true};
-cvar_t cl_pmodel = {"_cl_pmodel", "0", true};
+cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"};
+cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"};
+cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
 
-cvar_t cl_shownet = {"cl_shownet","0"};        // can be 0, 1, or 2
-cvar_t cl_nolerp = {"cl_nolerp","0"};
+cvar_t cl_shownet = {0, "cl_shownet","0"};
+cvar_t cl_nolerp = {0, "cl_nolerp", "0"};
 
-cvar_t lookspring = {"lookspring","0", true};
-cvar_t lookstrafe = {"lookstrafe","0", true};
-cvar_t sensitivity = {"sensitivity","3", true};
+cvar_t cl_itembobheight = {0, "cl_itembobheight", "8"};
+cvar_t cl_itembobspeed = {0, "cl_itembobspeed", "0.5"};
 
-cvar_t m_pitch = {"m_pitch","0.022", true};
-cvar_t m_yaw = {"m_yaw","0.022", true};
-cvar_t m_forward = {"m_forward","1", true};
-cvar_t m_side = {"m_side","0.8", true};
+cvar_t lookspring = {CVAR_SAVE, "lookspring","0"};
+cvar_t lookstrafe = {CVAR_SAVE, "lookstrafe","0"};
+cvar_t sensitivity = {CVAR_SAVE, "sensitivity","3", 1, 30};
 
+cvar_t m_pitch = {CVAR_SAVE, "m_pitch","0.022"};
+cvar_t m_yaw = {CVAR_SAVE, "m_yaw","0.022"};
+cvar_t m_forward = {CVAR_SAVE, "m_forward","1"};
+cvar_t m_side = {CVAR_SAVE, "m_side","0.8"};
+
+cvar_t freelook = {CVAR_SAVE, "freelook", "1"};
+
+cvar_t cl_draweffects = {0, "cl_draweffects", "1"};
+
+mempool_t *cl_scores_mempool;
 
 client_static_t        cls;
 client_state_t cl;
 // FIXME: put these on hunk?
-//efrag_t                      cl_efrags[MAX_EFRAGS];
 entity_t               cl_entities[MAX_EDICTS];
 entity_t               cl_static_entities[MAX_STATIC_ENTITIES];
 lightstyle_t   cl_lightstyle[MAX_LIGHTSTYLES];
-dlight_t               cl_dlights[MAX_DLIGHTS];
 
 int                            cl_numvisedicts;
 entity_t               *cl_visedicts[MAX_VISEDICTS];
 
+typedef struct effect_s
+{
+       int active;
+       vec3_t origin;
+       float starttime;
+       float framerate;
+       int modelindex;
+       int startframe;
+       int endframe;
+       // these are for interpolation
+       int frame;
+       double frame1time;
+       double frame2time;
+}
+cl_effect_t;
+
+#define MAX_EFFECTS 256
+
+static cl_effect_t cl_effect[MAX_EFFECTS];
+
+
 /*
 =====================
 CL_ClearState
@@ -67,35 +94,67 @@ void CL_ClearState (void)
        if (!sv.active)
                Host_ClearMemory ();
 
+       Mem_EmptyPool(cl_scores_mempool);
+
 // wipe the entire cl structure
        memset (&cl, 0, sizeof(cl));
 
        SZ_Clear (&cls.message);
 
-// clear other arrays  
-//     memset (cl_efrags, 0, sizeof(cl_efrags));
-       memset (cl_entities, 0, sizeof(cl_entities));
-       memset (cl_dlights, 0, sizeof(cl_dlights));
-       memset (cl_lightstyle, 0, sizeof(cl_lightstyle));
-       memset (cl_temp_entities, 0, sizeof(cl_temp_entities));
-       memset (cl_beams, 0, sizeof(cl_beams));
+// clear other arrays
+       memset(cl_entities, 0, sizeof(cl_entities));
+       memset(cl_lightstyle, 0, sizeof(cl_lightstyle));
+       memset(cl_temp_entities, 0, sizeof(cl_temp_entities));
+       memset(cl_beams, 0, sizeof(cl_beams));
+       memset(cl_dlights, 0, sizeof(cl_dlights));
+       memset(cl_effect, 0, sizeof(cl_effect));
+       CL_Particles_Clear();
+       CL_Decals_Clear();
        // LordHavoc: have to set up the baseline info for alpha and other stuff
        for (i = 0;i < MAX_EDICTS;i++)
        {
-               cl_entities[i].state_baseline.alpha = 255;
-               cl_entities[i].state_baseline.scale = 16;
-               cl_entities[i].state_baseline.glowsize = 0;
-               cl_entities[i].state_baseline.glowcolor = 254;
-               cl_entities[i].state_baseline.colormod = 255;
+               ClearStateToDefault(&cl_entities[i].state_baseline);
+               ClearStateToDefault(&cl_entities[i].state_previous);
+               ClearStateToDefault(&cl_entities[i].state_current);
        }
+}
 
-////
-//// allocate the efrags and chain together into a free list
-////
-//     cl.free_efrags = cl_efrags;
-//     for (i=0 ; i<MAX_EFRAGS-1 ; i++)
-//             cl.free_efrags[i].entnext = &cl.free_efrags[i+1];
-//     cl.free_efrags[i].entnext = NULL;
+void CL_LerpUpdate(entity_t *e, int frame, int modelindex)
+{
+       entity_persistent_t *p;
+       entity_render_t *r;
+       p = &e->persistent;
+       r = &e->render;
+
+       if (p->modelindex != modelindex)
+       {
+               // reset all interpolation information
+               p->modelindex = modelindex;
+               p->frame1 = p->frame2 = frame;
+               p->frame1time = p->frame2time = cl.time;
+               p->framelerp = 1;
+       }
+       else if (p->frame2 != frame)
+       {
+               // transition to new frame
+               p->frame1 = p->frame2;
+               p->frame1time = p->frame2time;
+               p->frame2 = frame;
+               p->frame2time = cl.time;
+               p->framelerp = 0;
+       }
+       else
+       {
+               // update transition
+               p->framelerp = (cl.time - p->frame2time) * 10;
+               p->framelerp = bound(0, p->framelerp, 1);
+       }
+
+       r->frame1 = p->frame1;
+       r->frame2 = p->frame2;
+       r->framelerp = p->framelerp;
+       r->frame1time = p->frame1time;
+       r->frame2time = p->frame2time;
 }
 
 /*
@@ -117,7 +176,8 @@ void CL_Disconnect (void)
        cl.cshifts[2].percent = 0;
        cl.cshifts[3].percent = 0;
 
-// if running a local server, shut it down
+       cl.worldmodel = NULL;
+
        if (cls.demoplayback)
                CL_StopPlayback ();
        else if (cls.state == ca_connected)
@@ -131,11 +191,11 @@ void CL_Disconnect (void)
                NET_SendUnreliableMessage (cls.netcon, &cls.message);
                SZ_Clear (&cls.message);
                NET_Close (cls.netcon);
-
-               cls.state = ca_disconnected;
+               // if running a local server, shut it down
                if (sv.active)
                        Host_ShutdownServer(false);
        }
+       cls.state = ca_disconnected;
 
        cls.demoplayback = cls.timedemo = false;
        cls.signon = 0;
@@ -172,191 +232,41 @@ void CL_EstablishConnection (char *host)
        if (!cls.netcon)
                Host_Error ("CL_Connect: connect failed\n");
        Con_DPrintf ("CL_EstablishConnection: connected to %s\n", host);
-       
+
        cls.demonum = -1;                       // not in the demo loop now
        cls.state = ca_connected;
        cls.signon = 0;                         // need all the signon messages before playing
 }
 
 /*
-=====================
-CL_SignonReply
-
-An svc_signonnum has been received, perform a client side setup
-=====================
-*/
-void CL_SignonReply (void)
-{
-       char    str[8192];
-
-Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
-
-       switch (cls.signon)
-       {
-       case 1:
-               MSG_WriteByte (&cls.message, clc_stringcmd);
-               MSG_WriteString (&cls.message, "prespawn");
-               break;
-               
-       case 2:
-               MSG_WriteByte (&cls.message, clc_stringcmd);
-               MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string));
-
-               MSG_WriteByte (&cls.message, clc_stringcmd);
-               MSG_WriteString (&cls.message, va("color %i %i\n", ((int)cl_color.value)>>4, ((int)cl_color.value)&15));
-       
-               if (cl_pmodel.value)
-               {
-                       MSG_WriteByte (&cls.message, clc_stringcmd);
-                       MSG_WriteString (&cls.message, va("pmodel %f\n", cl_pmodel.value));
-               }
-
-               MSG_WriteByte (&cls.message, clc_stringcmd);
-               sprintf (str, "spawn %s", cls.spawnparms);
-               MSG_WriteString (&cls.message, str);
-               break;
-               
-       case 3: 
-               MSG_WriteByte (&cls.message, clc_stringcmd);
-               MSG_WriteString (&cls.message, "begin");
-               Cache_Report ();                // print remaining memory
-               break;
-               
-       case 4:
-//             SCR_EndLoadingPlaque ();                // allow normal screen updates
-               Con_ClearNotify();
-               break;
-       }
-}
-
-/*
-=====================
-CL_NextDemo
-
-Called to play the next demo in the demo loop
-=====================
-*/
-void CL_NextDemo (void)
-{
-       char    str[1024];
-
-       if (cls.demonum == -1)
-               return;         // don't play demos
-
-//     SCR_BeginLoadingPlaque ();
-
-       if (!cls.demos[cls.demonum][0] || cls.demonum == MAX_DEMOS)
-       {
-               cls.demonum = 0;
-               if (!cls.demos[cls.demonum][0])
-               {
-                       Con_Printf ("No demos listed with startdemos\n");
-                       cls.demonum = -1;
-                       return;
-               }
-       }
-
-       sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]);
-       Cbuf_InsertText (str);
-       cls.demonum++;
-}
-
-/*
 ==============
 CL_PrintEntities_f
 ==============
 */
-void CL_PrintEntities_f (void)
+static void CL_PrintEntities_f (void)
 {
        entity_t        *ent;
-       int                     i;
-       
+       int                     i, j;
+       char            name[32];
+
        for (i = 0, ent = cl_entities;i < MAX_EDICTS /*cl.num_entities*/;i++, ent++)
        {
-               Con_Printf ("%3i:", i);
+               if (!ent->state_current.active)
+                       continue;
                if (!ent->render.model)
-               {
-                       Con_Printf ("EMPTY\n");
                        continue;
-               }
-               Con_Printf ("%s:%2i  (%5.1f,%5.1f,%5.1f) [%5.1f %5.1f %5.1f]\n", ent->render.model->name, ent->render.frame, ent->render.origin[0], ent->render.origin[1], ent->render.origin[2], ent->render.angles[0], ent->render.angles[1], ent->render.angles[2]);
-       }
-}
-
 
-/*
-===============
-CL_AllocDlight
-
-===============
-*/
-void CL_AllocDlight (entity_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime)
-{
-       int             i;
-       dlight_t        *dl;
-
-// first look for an exact key match
-       if (ent)
-       {
-               dl = cl_dlights;
-               for (i = 0;i < MAX_DLIGHTS;i++, dl++)
-                       if (dl->ent == ent)
-                               goto dlightsetup;
-       }
-
-// then look for anything else
-       dl = cl_dlights;
-       for (i = 0;i < MAX_DLIGHTS;i++, dl++)
-               if (!dl->radius)
-                       goto dlightsetup;
-
-       // unable to find one
-       return;
-
-dlightsetup:
-       memset (dl, 0, sizeof(*dl));
-       dl->ent = ent;
-       VectorCopy(org, dl->origin);
-       dl->radius = radius;
-       dl->color[0] = red;
-       dl->color[1] = green;
-       dl->color[2] = blue;
-       dl->decay = decay;
-       dl->die = cl.time + lifetime;
-}
-
-
-/*
-===============
-CL_DecayLights
-
-===============
-*/
-void CL_DecayLights (void)
-{
-       int                     i;
-       dlight_t        *dl;
-       float           time;
-       
-       time = cl.time - cl.oldtime;
-
-       c_dlights = 0;
-       dl = cl_dlights;
-       for (i=0 ; i<MAX_DLIGHTS ; i++, dl++)
-       {
-               if (!dl->radius)
-                       continue;
-               if (dl->die < cl.time)
+               Con_Printf ("%3i:", i);
+               if (!ent->render.model)
                {
-                       dl->radius = 0;
+                       Con_Printf ("EMPTY\n");
                        continue;
                }
-
-               c_dlights++; // count every dlight in use
-
-               dl->radius -= time*dl->decay;
-               if (dl->radius < 0)
-                       dl->radius = 0;
+               strncpy(name, ent->render.model->name, 30);
+               name[30] = 0;
+               for (j = strlen(name);j < 30;j++)
+                       name[j] = ' ';
+               Con_Printf ("%s:%04i (%5i %5i %5i) [%3i %3i %3i]\n", name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360);
        }
 }
 
@@ -369,19 +279,19 @@ Determines the fraction between the last two messages that the objects
 should be put at.
 ===============
 */
-float  CL_LerpPoint (void)
+static float CL_LerpPoint (void)
 {
        float   f, frac;
 
        f = cl.mtime[0] - cl.mtime[1];
 
        // LordHavoc: lerp in listen games as the server is being capped below the client (usually)
-       if (!f || cl_nolerp.value || cls.timedemo || (sv.active && svs.maxclients == 1))
+       if (!f || cl_nolerp.integer || cls.timedemo || (sv.active && svs.maxclients == 1))
        {
                cl.time = cl.mtime[0];
                return 1;
        }
-               
+
        if (f > 0.1)
        {       // dropped packet, or start of demo
                cl.mtime[1] = cl.mtime[0] - 0.1;
@@ -407,40 +317,18 @@ float     CL_LerpPoint (void)
                }
                frac = 1;
        }
-               
-       return frac;
-}
-
-float CL_EntityLerpPoint (entity_t *ent)
-{
-       float   f;
-
-       if (cl_nolerp.value || cls.timedemo || (sv.active && svs.maxclients == 1))
-               return 1;
-
-       f = ent->state_current.time - ent->state_previous.time;
-//     Con_Printf(" %g-%g=%g", ent->state_current.time, ent->state_previous.time, f);
 
-       if (f <= 0)
-               return 1;
-       if (f >= 0.1)
-               f = 0.1;
-
-//     Con_Printf(" %g-%g/%g=%f", cl.time, ent->state_previous.time, f, (cl.time - ent->state_previous.time) / f);
-       f = (cl.time - ent->state_previous.time) / f;
-       return bound(0, f, 1);
+       return frac;
 }
 
-void CL_RelinkStaticEntities()
+static void CL_RelinkStaticEntities(void)
 {
-       entity_t *ent, *endent;
-       if (cl.num_statics > MAX_VISEDICTS)
-               Host_Error("CL_RelinkStaticEntities: cl.num_statics > MAX_VISEDICTS??\n");
-
-       ent = cl_static_entities;
-       endent = ent + cl.num_statics;
-       for (;ent < endent;ent++)
-               cl_visedicts[cl_numvisedicts++] = ent;
+       int i;
+       for (i = 0;i < cl.num_statics && cl_numvisedicts < MAX_VISEDICTS;i++)
+       {
+               Mod_CheckLoaded(cl_static_entities[i].render.model);
+               cl_visedicts[cl_numvisedicts++] = &cl_static_entities[i];
+       }
 }
 
 /*
@@ -448,44 +336,21 @@ void CL_RelinkStaticEntities()
 CL_RelinkEntities
 ===============
 */
-void R_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent);
-void CL_RelinkEntities (void)
+static void CL_RelinkNetworkEntities()
 {
        entity_t        *ent;
-       int                     i, j;
-       float           frac, f, d, bobjrotate/*, bobjoffset*/, dlightradius;
-       vec3_t          oldorg, delta, dlightcolor;
-
-// determine partial update time       
-       frac = CL_LerpPoint ();
+       int                     i, glowcolor, effects;
+       float           f, d, bobjrotate, bobjoffset, dlightradius, glowsize, lerp;
+       vec3_t          oldorg, neworg, delta, dlightcolor;
 
-       cl_numvisedicts = 0;
+       bobjrotate = ANGLEMOD(100*cl.time);
+       if (cl_itembobheight.value)
+               bobjoffset = (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value;
+       else
+               bobjoffset = 0;
 
        CL_RelinkStaticEntities();
 
-//
-// interpolate player info
-//
-       for (i = 0;i < 3;i++)
-               cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
-
-       if (cls.demoplayback)
-       {
-       // interpolate the angles       
-               for (j = 0;j < 3;j++)
-               {
-                       d = cl.mviewangles[0][j] - cl.mviewangles[1][j];
-                       if (d > 180)
-                               d -= 360;
-                       else if (d < -180)
-                               d += 360;
-                       cl.viewangles[j] = cl.mviewangles[1][j] + frac*d;
-               }
-       }
-       
-       bobjrotate = ANGLEMOD(100*cl.time);
-//     bobjoffset = cos(180 * cl.time * M_PI / 180) * 4.0f + 4.0f;
-       
 // start on the entity after the world
        for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS /*cl.num_entities*/;i++, ent++)
        {
@@ -493,55 +358,116 @@ void CL_RelinkEntities (void)
                if (!ent->state_current.active)
                        continue;
 
-               VectorCopy (ent->render.origin, oldorg);
+               VectorCopy(ent->persistent.trail_origin, oldorg);
 
                if (!ent->state_previous.active)
                {
                        // only one state available
-                       VectorCopy (ent->state_current.origin, ent->render.origin);
+                       lerp = 1;
+                       VectorCopy (ent->state_current.origin, oldorg); // skip trails
+                       VectorCopy (ent->state_current.origin, neworg);
                        VectorCopy (ent->state_current.angles, ent->render.angles);
-//                     Con_Printf(" %i", i);
+
+                       /*
+                       // monster interpolation
+                       ent->persistent.steplerptime = 0;
+                       VectorCopy(ent->state_current.origin, ent->persistent.stepoldorigin);
+                       VectorCopy(ent->state_current.angles, ent->persistent.stepoldangles);
+                       VectorCopy(ent->state_current.origin, ent->persistent.steporigin);
+                       VectorCopy(ent->state_current.angles, ent->persistent.stepangles);
+                       */
                }
+               /*
+               else if ((ent->state_current.flags & ent->state_previous.flags) & ENTFLAG_STEP)
+               {
+                       if (ent->state_current.origin[0] != ent->persistent.steporigin[0]
+                        || ent->state_current.origin[1] != ent->persistent.steporigin[1]
+                        || ent->state_current.origin[2] != ent->persistent.steporigin[2]
+                        || ent->state_current.angles[0] != ent->persistent.stepangles[0]
+                        || ent->state_current.angles[1] != ent->persistent.stepangles[1]
+                        || ent->state_current.angles[2] != ent->persistent.stepangles[2])
+                       {
+                               // update lerp positions
+                               ent->clientpersistent.steplerptime = sv.time;
+                               VectorCopy(ent->steporigin, ent->stepoldorigin);
+                               VectorCopy(ent->stepangles, ent->stepoldangles);
+                               VectorCopy(ent->v.origin, ent->steporigin);
+                               VectorCopy(ent->v.angles, ent->stepangles);
+                       }
+                       lerp = (cl.time - ent->persistent.steplerptime) * 10.0;
+                       if (lerp < 1)
+                       {
+                               // origin
+                               VectorSubtract(ent->persistent.steporigin, ent->persistent.stepoldorigin, delta);
+                               VectorMA(ent->persistent.stepoldorigin, lerp, delta, neworg);
+
+                               // angles
+                               VectorSubtract(ent->persistent.stepangles, ent->persistent.stepoldangles, delta);
+                               // choose shortest rotate (to avoid 'spin around' situations)
+                               if (delta[0] < -180) delta[0] += 360;else if (delta[0] >= 180) delta[0] -= 360;
+                               if (delta[1] < -180) delta[1] += 360;else if (delta[1] >= 180) delta[1] -= 360;
+                               if (delta[2] < -180) delta[2] += 360;else if (delta[2] >= 180) delta[2] -= 360;
+                               VectorMA(ent->stepoldangles, lerp, delta, ent->render.angles);
+                       }
+                       else
+                       {
+                               VectorCopy(ent->persistent.steporigin, neworg);
+                               VectorCopy(ent->persistent.stepangles, ent->render.angles);
+                       }
+               }
+               */
                else
                {
+                       /*
+                       // monster interpolation
+                       ent->persistent.steplerptime = 0;
+                       VectorCopy(ent->state_current.origin, ent->persistent.stepoldorigin);
+                       VectorCopy(ent->state_current.angles, ent->persistent.stepoldangles);
+                       VectorCopy(ent->state_current.origin, ent->persistent.steporigin);
+                       VectorCopy(ent->state_current.angles, ent->persistent.stepangles);
+                       */
+
                        // if the delta is large, assume a teleport and don't lerp
-                       f = CL_EntityLerpPoint(ent);
-                       if (f < 1)
+                       VectorSubtract(ent->state_current.origin, ent->state_previous.origin, delta);
+                       // LordHavoc: increased tolerance from 100 to 200
+                       if ((sv.active && svs.maxclients == 1 && !(ent->state_current.flags & RENDER_STEP)) || cls.timedemo || DotProduct(delta, delta) > 200*200 || cl_nolerp.integer)
+                               lerp = 1;
+                       else
                        {
-                               for (j = 0;j < 3;j++)
-                               {
-                                       delta[j] = ent->state_current.origin[j] - ent->state_previous.origin[j];
-                                       // LordHavoc: increased lerp tolerance from 100 to 200
-                                       if (delta[j] > 200 || delta[j] < -200)
-                                               f = 1;
-                               }
+                               f = ent->state_current.time - ent->state_previous.time;
+                               if (f > 0)
+                                       lerp = (cl.time - ent->state_previous.time) / f;
+                               else
+                                       lerp = 1;
                        }
-                       if (f >= 1)
+                       if (lerp >= 1)
                        {
                                // no interpolation
-                               VectorCopy (ent->state_current.origin, ent->render.origin);
+                               VectorCopy (ent->state_current.origin, neworg);
                                VectorCopy (ent->state_current.angles, ent->render.angles);
                        }
                        else
                        {
                                // interpolate the origin and angles
-                               for (j = 0;j < 3;j++)
-                               {
-                                       ent->render.origin[j] = ent->state_previous.origin[j] + f*delta[j];
-
-                                       d = ent->state_current.angles[j] - ent->state_previous.angles[j];
-                                       if (d > 180)
-                                               d -= 360;
-                                       else if (d < -180)
-                                               d += 360;
-                                       ent->render.angles[j] = ent->state_previous.angles[j] + f*d;
-                               }
+                               VectorMA(ent->state_previous.origin, lerp, delta, neworg);
+                               VectorSubtract(ent->state_current.angles, ent->state_previous.angles, delta);
+                               if (delta[0] < -180) delta[0] += 360;else if (delta[0] >= 180) delta[0] -= 360;
+                               if (delta[1] < -180) delta[1] += 360;else if (delta[1] >= 180) delta[1] -= 360;
+                               if (delta[2] < -180) delta[2] += 360;else if (delta[2] >= 180) delta[2] -= 360;
+                               VectorMA(ent->state_previous.angles, lerp, delta, ent->render.angles);
                        }
                }
 
+               VectorCopy (neworg, ent->persistent.trail_origin);
+               // persistent.modelindex will be updated by CL_LerpUpdate
+               if (ent->state_current.modelindex != ent->persistent.modelindex || !ent->state_previous.active)
+                       VectorCopy(neworg, oldorg);
+
+               VectorCopy (neworg, ent->render.origin);
                ent->render.flags = ent->state_current.flags;
-               ent->render.effects = ent->state_current.effects;
+               ent->render.effects = effects = ent->state_current.effects;
                ent->render.model = cl.model_precache[ent->state_current.modelindex];
+               Mod_CheckLoaded(ent->render.model);
                ent->render.frame = ent->state_current.frame;
                if (cl.scores == NULL || !ent->state_current.colormap)
                        ent->render.colormap = -1; // no special coloring
@@ -550,70 +476,85 @@ void CL_RelinkEntities (void)
                ent->render.skinnum = ent->state_current.skin;
                ent->render.alpha = ent->state_current.alpha * (1.0f / 255.0f); // FIXME: interpolate?
                ent->render.scale = ent->state_current.scale * (1.0f / 16.0f); // FIXME: interpolate?
-               ent->render.glowsize = ent->state_current.glowsize * 4.0f; // FIXME: interpolate?
-               ent->render.glowcolor = ent->state_current.glowcolor;
-               ent->render.colormod[0] = (float) ((ent->state_current.colormod >> 5) & 7) * (1.0f / 7.0f);
-               ent->render.colormod[1] = (float) ((ent->state_current.colormod >> 2) & 7) * (1.0f / 7.0f);
-               ent->render.colormod[2] = (float) (ent->state_current.colormod & 3) * (1.0f / 3.0f);
+               glowsize = ent->state_current.glowsize * 4.0f; // FIXME: interpolate?
+               glowcolor = ent->state_current.glowcolor;
+
+               // update interpolation info
+               CL_LerpUpdate(ent, ent->state_current.frame, ent->state_current.modelindex);
 
+               // handle effects now...
                dlightradius = 0;
                dlightcolor[0] = 0;
                dlightcolor[1] = 0;
                dlightcolor[2] = 0;
 
                // LordHavoc: if the entity has no effects, don't check each
-               if (ent->render.effects)
+               if (effects)
                {
-                       if (ent->render.effects & EF_BRIGHTFIELD)
-                               R_EntityParticles (ent);
-                       if (ent->render.effects & EF_MUZZLEFLASH)
+                       if (effects & EF_BRIGHTFIELD)
+                               CL_EntityParticles (ent);
+                       if (effects & EF_MUZZLEFLASH)
                        {
-                               vec3_t v;
+                               vec3_t v, v2;
 
                                AngleVectors (ent->render.angles, v, NULL, NULL);
 
-                               v[0] = v[0] * 18 + ent->render.origin[0];
-                               v[1] = v[1] * 18 + ent->render.origin[1];
-                               v[2] = v[2] * 18 + ent->render.origin[2] + 16;
+                               v2[0] = v[0] * 18 + neworg[0];
+                               v2[1] = v[1] * 18 + neworg[1];
+                               v2[2] = v[2] * 18 + neworg[2] + 16;
+                               TraceLine(neworg, v2, v, NULL, 0);
 
                                CL_AllocDlight (NULL, v, 100, 1, 1, 1, 0, 0.1);
                        }
-                       if (ent->render.effects & EF_DIMLIGHT)
+                       if (effects & EF_DIMLIGHT)
                        {
                                dlightcolor[0] += 200.0f;
                                dlightcolor[1] += 200.0f;
                                dlightcolor[2] += 200.0f;
                        }
-                       if (ent->render.effects & EF_BRIGHTLIGHT)
+                       if (effects & EF_BRIGHTLIGHT)
                        {
                                dlightcolor[0] += 400.0f;
                                dlightcolor[1] += 400.0f;
                                dlightcolor[2] += 400.0f;
                        }
                        // LordHavoc: added EF_RED and EF_BLUE
-                       if (ent->render.effects & EF_RED) // red
+                       if (effects & EF_RED) // red
                        {
                                dlightcolor[0] += 200.0f;
                                dlightcolor[1] +=  20.0f;
                                dlightcolor[2] +=  20.0f;
                        }
-                       if (ent->render.effects & EF_BLUE) // blue
+                       if (effects & EF_BLUE) // blue
                        {
                                dlightcolor[0] +=  20.0f;
                                dlightcolor[1] +=  20.0f;
                                dlightcolor[2] += 200.0f;
                        }
-                       else if (ent->render.effects & EF_FLAME)
+                       if (effects & EF_FLAME)
                        {
                                if (ent->render.model)
                                {
                                        vec3_t mins, maxs;
                                        int temp;
-                                       VectorAdd(ent->render.origin, ent->render.model->mins, mins);
-                                       VectorAdd(ent->render.origin, ent->render.model->maxs, maxs);
+                                       if (ent->render.angles[0] || ent->render.angles[2])
+                                       {
+                                               VectorAdd(neworg, ent->render.model->rotatedmins, mins);
+                                               VectorAdd(neworg, ent->render.model->rotatedmaxs, maxs);
+                                       }
+                                       else if (ent->render.angles[1])
+                                       {
+                                               VectorAdd(neworg, ent->render.model->yawmins, mins);
+                                               VectorAdd(neworg, ent->render.model->yawmaxs, maxs);
+                                       }
+                                       else
+                                       {
+                                               VectorAdd(neworg, ent->render.model->normalmins, mins);
+                                               VectorAdd(neworg, ent->render.model->normalmaxs, maxs);
+                                       }
                                        // how many flames to make
                                        temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300);
-                                       R_FlameCube(mins, maxs, temp);
+                                       CL_FlameCube(mins, maxs, temp);
                                }
                                d = lhrandom(200, 250);
                                dlightcolor[0] += d * 1.0f;
@@ -628,22 +569,22 @@ void CL_RelinkEntities (void)
                        if (ent->render.model->flags & EF_ROTATE)
                        {
                                ent->render.angles[1] = bobjrotate;
-//                             ent->render.origin[2] += bobjoffset;
+                               ent->render.origin[2] += bobjoffset;
                        }
                        // only do trails if present in the previous frame as well
                        if (ent->state_previous.active)
                        {
                                if (ent->render.model->flags & EF_GIB)
-                                       R_RocketTrail (oldorg, ent->render.origin, 2, ent);
+                                       CL_RocketTrail (oldorg, neworg, 2, ent);
                                else if (ent->render.model->flags & EF_ZOMGIB)
-                                       R_RocketTrail (oldorg, ent->render.origin, 4, ent);
+                                       CL_RocketTrail (oldorg, neworg, 4, ent);
                                else if (ent->render.model->flags & EF_TRACER)
-                                       R_RocketTrail (oldorg, ent->render.origin, 3, ent);
+                                       CL_RocketTrail (oldorg, neworg, 3, ent);
                                else if (ent->render.model->flags & EF_TRACER2)
-                                       R_RocketTrail (oldorg, ent->render.origin, 5, ent);
+                                       CL_RocketTrail (oldorg, neworg, 5, ent);
                                else if (ent->render.model->flags & EF_ROCKET)
                                {
-                                       R_RocketTrail (oldorg, ent->render.origin, 0, ent);
+                                       CL_RocketTrail (oldorg, ent->render.origin, 0, ent);
                                        dlightcolor[0] += 200.0f;
                                        dlightcolor[1] += 160.0f;
                                        dlightcolor[2] +=  80.0f;
@@ -651,49 +592,170 @@ void CL_RelinkEntities (void)
                                else if (ent->render.model->flags & EF_GRENADE)
                                {
                                        if (ent->render.alpha == -1) // LordHavoc: Nehahra dem compatibility
-                                               R_RocketTrail (oldorg, ent->render.origin, 7, ent);
+                                               CL_RocketTrail (oldorg, neworg, 7, ent);
                                        else
-                                               R_RocketTrail (oldorg, ent->render.origin, 1, ent);
+                                               CL_RocketTrail (oldorg, neworg, 1, ent);
                                }
                                else if (ent->render.model->flags & EF_TRACER3)
-                                       R_RocketTrail (oldorg, ent->render.origin, 6, ent);
+                                       CL_RocketTrail (oldorg, neworg, 6, ent);
                        }
                }
                // LordHavoc: customizable glow
-               if (ent->render.glowsize)
+               if (glowsize)
                {
-                       byte *tempcolor = (byte *)&d_8to24table[ent->render.glowcolor];
-                       dlightcolor[0] += ent->render.glowsize * tempcolor[0] * (1.0f / 255.0f);
-                       dlightcolor[1] += ent->render.glowsize * tempcolor[1] * (1.0f / 255.0f);
-                       dlightcolor[2] += ent->render.glowsize * tempcolor[2] * (1.0f / 255.0f);
+                       byte *tempcolor = (byte *)&d_8to24table[glowcolor];
+                       dlightcolor[0] += glowsize * tempcolor[0] * (1.0f / 255.0f);
+                       dlightcolor[1] += glowsize * tempcolor[1] * (1.0f / 255.0f);
+                       dlightcolor[2] += glowsize * tempcolor[2] * (1.0f / 255.0f);
                }
                // LordHavoc: customizable trail
                if (ent->render.flags & RENDER_GLOWTRAIL)
-                       R_RocketTrail2 (oldorg, ent->render.origin, ent->render.glowcolor, ent);
+                       CL_RocketTrail2 (oldorg, neworg, glowcolor, ent);
 
                if (dlightcolor[0] || dlightcolor[1] || dlightcolor[2])
                {
+                       vec3_t vec;
                        dlightradius = VectorLength(dlightcolor);
                        d = 1.0f / dlightradius;
-                       CL_AllocDlight (ent, ent->render.origin, dlightradius, dlightcolor[0] * d, dlightcolor[1] * d, dlightcolor[2] * d, 0, 0);
+                       VectorCopy(neworg, vec);
+                       // hack to make glowing player light shine on their gun
+                       if (i == cl.viewentity && !chase_active.integer)
+                               vec[2] += 30;
+                       CL_AllocDlight (&ent->render, vec, dlightradius, dlightcolor[0] * d, dlightcolor[1] * d, dlightcolor[2] * d, 0, 0);
                }
 
-               if (i == cl.viewentity && !chase_active.value)
-                       continue;
+               if (chase_active.integer)
+               {
+                       if (ent->render.flags & RENDER_VIEWMODEL)
+                               continue;
+               }
+               else
+               {
+                       if (i == cl.viewentity || (ent->render.flags & RENDER_EXTERIORMODEL))
+                               continue;
+               }
 
                if (ent->render.model == NULL)
                        continue;
-               if (ent->render.effects & EF_NODRAW)
+               if (effects & EF_NODRAW)
                        continue;
                if (cl_numvisedicts < MAX_VISEDICTS)
                        cl_visedicts[cl_numvisedicts++] = ent;
        }
-//     Con_Printf("\n");
 }
 
+static void CL_LerpPlayerVelocity (void)
+{
+       int i;
+       float frac, d;
+
+       // fraction from previous network update to current
+       frac = CL_LerpPoint ();
+
+       for (i = 0;i < 3;i++)
+               cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
+
+       if (cls.demoplayback)
+       {
+               // interpolate the angles
+               for (i = 0;i < 3;i++)
+               {
+                       d = cl.mviewangles[0][i] - cl.mviewangles[1][i];
+                       if (d > 180)
+                               d -= 360;
+                       else if (d < -180)
+                               d += 360;
+                       cl.viewangles[i] = cl.mviewangles[1][i] + frac*d;
+               }
+       }
+}
+
+void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate)
+{
+       int i;
+       cl_effect_t *e;
+       if (!modelindex) // sanity check
+               return;
+       for (i = 0, e = cl_effect;i < MAX_EFFECTS;i++, e++)
+       {
+               if (e->active)
+                       continue;
+               e->active = true;
+               VectorCopy(org, e->origin);
+               e->modelindex = modelindex;
+               e->starttime = cl.time;
+               e->startframe = startframe;
+               e->endframe = startframe + framecount;
+               e->framerate = framerate;
+
+               e->frame = 0;
+               e->frame1time = cl.time;
+               e->frame2time = cl.time;
+               break;
+       }
+}
+
+static void CL_RelinkEffects()
+{
+       int i, intframe;
+       cl_effect_t *e;
+       entity_t *vis;
+       float frame;
+
+       for (i = 0, e = cl_effect;i < MAX_EFFECTS;i++, e++)
+       {
+               if (e->active)
+               {
+                       frame = (cl.time - e->starttime) * e->framerate + e->startframe;
+                       intframe = frame;
+                       if (intframe < 0 || intframe >= e->endframe)
+                       {
+                               e->active = false;
+                               memset(e, 0, sizeof(*e));
+                               continue;
+                       }
+
+                       if (intframe != e->frame)
+                       {
+                               e->frame = intframe;
+                               e->frame1time = e->frame2time;
+                               e->frame2time = cl.time;
+                       }
+
+                       if ((vis = CL_NewTempEntity()))
+                       {
+                               // interpolation stuff
+                               vis->render.frame1 = intframe;
+                               vis->render.frame2 = intframe + 1;
+                               if (vis->render.frame2 >= e->endframe)
+                                       vis->render.frame2 = -1; // disappear
+                               vis->render.framelerp = frame - intframe;
+                               vis->render.frame1time = e->frame1time;
+                               vis->render.frame2time = e->frame2time;
+
+                               // normal stuff
+                               VectorCopy(e->origin, vis->render.origin);
+                               vis->render.model = cl.model_precache[e->modelindex];
+                               vis->render.frame = vis->render.frame2;
+                               vis->render.colormap = -1; // no special coloring
+                               vis->render.scale = 1;
+                               vis->render.alpha = 1;
+                       }
+               }
+       }
+}
+
+void CL_RelinkEntities (void)
+{
+       cl_numvisedicts = 0;
+
+       CL_LerpPlayerVelocity();
+       CL_RelinkNetworkEntities();
+       CL_RelinkEffects();
+       CL_MoveParticles();
+       CL_UpdateDecals();
+}
 
-// used by cl_shownet
-int netshown;
 
 /*
 ===============
@@ -704,11 +766,11 @@ Read all incoming data from the server
 */
 int CL_ReadFromServer (void)
 {
-       int             ret;
+       int ret, netshown;
 
        cl.oldtime = cl.time;
        cl.time += cl.frametime;
-       
+
        netshown = false;
        do
        {
@@ -717,17 +779,21 @@ int CL_ReadFromServer (void)
                        Host_Error ("CL_ReadFromServer: lost server connection");
                if (!ret)
                        break;
-               
+
                cl.last_received_message = realtime;
+
+               if (cl_shownet.integer)
+                       netshown = true;
+
                CL_ParseServerMessage ();
-       } while (ret && cls.state == ca_connected);
-       
+       }
+       while (ret && cls.state == ca_connected);
+
        if (netshown)
                Con_Printf ("\n");
 
        CL_RelinkEntities ();
        CL_UpdateTEnts ();
-       CL_DoEffects ();
 
 //
 // bring the links up to date
@@ -751,10 +817,10 @@ void CL_SendCmd (void)
        {
        // get basic movement from keyboard
                CL_BaseMove (&cmd);
-       
+
        // allow mice or other external controllers to add to the move
                IN_Move (&cmd);
-       
+
        // send the unreliable message
                CL_SendMove (&cmd);
        }
@@ -764,11 +830,11 @@ void CL_SendCmd (void)
                SZ_Clear (&cls.message);
                return;
        }
-       
+
 // send the reliable message
        if (!cls.message.cursize)
                return;         // no message at all
-       
+
        if (!NET_CanSendMessage (cls.netcon))
        {
                Con_DPrintf ("CL_WriteToServer: can't send\n");
@@ -782,7 +848,7 @@ void CL_SendCmd (void)
 }
 
 // LordHavoc: pausedemo command
-void CL_PauseDemo_f (void)
+static void CL_PauseDemo_f (void)
 {
        cls.demopaused = !cls.demopaused;
        if (cls.demopaused)
@@ -797,7 +863,7 @@ CL_PModel_f
 LordHavoc: Intended for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
 ======================
 */
-void CL_PModel_f (void)
+static void CL_PModel_f (void)
 {
        int i;
        eval_t *val;
@@ -811,7 +877,7 @@ void CL_PModel_f (void)
 
        if (cmd_source == src_command)
        {
-               if (cl_pmodel.value == i)
+               if (cl_pmodel.integer == i)
                        return;
                Cvar_SetValue ("_cl_pmodel", i);
                if (cls.state == ca_connected)
@@ -829,7 +895,7 @@ void CL_PModel_f (void)
 CL_Fog_f
 ======================
 */
-void CL_Fog_f (void)
+static void CL_Fog_f (void)
 {
        if (Cmd_Argc () == 1)
        {
@@ -842,26 +908,25 @@ void CL_Fog_f (void)
        fog_blue = atof(Cmd_Argv(4));
 }
 
-cvar_t demo_nehahra = {"demo_nehahra", "0"};
-
 /*
 =================
 CL_Init
 =================
 */
 void CL_Init (void)
-{      
-       SZ_Alloc (&cls.message, 1024);
+{
+       SZ_Alloc (&cls.message, 1024, "cls.message");
 
        CL_InitInput ();
        CL_InitTEnts ();
-       
+
 //
 // register our commands
 //
        Cvar_RegisterVariable (&cl_name);
        Cvar_RegisterVariable (&cl_color);
-       Cvar_RegisterVariable (&cl_pmodel);
+       if (gamemode == GAME_NEHAHRA)
+               Cvar_RegisterVariable (&cl_pmodel);
        Cvar_RegisterVariable (&cl_upspeed);
        Cvar_RegisterVariable (&cl_forwardspeed);
        Cvar_RegisterVariable (&cl_backspeed);
@@ -875,15 +940,18 @@ void CL_Init (void)
        Cvar_RegisterVariable (&lookspring);
        Cvar_RegisterVariable (&lookstrafe);
        Cvar_RegisterVariable (&sensitivity);
+       Cvar_RegisterVariable (&freelook);
 
        Cvar_RegisterVariable (&m_pitch);
        Cvar_RegisterVariable (&m_yaw);
        Cvar_RegisterVariable (&m_forward);
        Cvar_RegisterVariable (&m_side);
 
-//     Cvar_RegisterVariable (&cl_autofire);
-       
+       Cvar_RegisterVariable (&cl_itembobspeed);
+       Cvar_RegisterVariable (&cl_itembobheight);
+
        Cmd_AddCommand ("entities", CL_PrintEntities_f);
+       Cmd_AddCommand ("bitprofile", CL_BitProfile_f);
        Cmd_AddCommand ("disconnect", CL_Disconnect_f);
        Cmd_AddCommand ("record", CL_Record_f);
        Cmd_AddCommand ("stop", CL_Stop_f);
@@ -894,11 +962,14 @@ void CL_Init (void)
 
        // LordHavoc: added pausedemo
        Cmd_AddCommand ("pausedemo", CL_PauseDemo_f);
-       // LordHavoc: added pmodel command (like name, etc, only intended for Nehahra)
-       Cmd_AddCommand ("pmodel", CL_PModel_f);
-       // LordHavoc: added demo_nehahra cvar
-       Cvar_RegisterVariable (&demo_nehahra);
-       if (nehahra)
-               Cvar_SetValue("demo_nehahra", 1);
-}
+       if (gamemode == GAME_NEHAHRA)
+               Cmd_AddCommand ("pmodel", CL_PModel_f);
 
+       cl_scores_mempool = Mem_AllocPool("client player info");
+
+       Cvar_RegisterVariable(&cl_draweffects);
+
+       CL_Parse_Init();
+       CL_Particles_Init();
+       CL_Decals_Init();
+}