]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_main.c
viewmodels should not emit dlights (they spawn around 0 0 0), thanks to Tomaz for...
[xonotic/darkplaces.git] / cl_main.c
index e251750ca0832f3c7166238dbd61b8dd218abf07..d47902f83721e474bf024d65c85a4599797f13a1 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -22,15 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "cl_collision.h"
 #include "cl_video.h"
+#include "image.h"
 
 // we need to declare some mouse variables here, because the menu system
 // references them even when on a unix system.
 
-// these two are not intended to be set directly
-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 = {0, "cl_shownet","0"};
 cvar_t cl_nolerp = {0, "cl_nolerp", "0"};
 
@@ -53,7 +49,12 @@ cvar_t r_draweffects = {0, "r_draweffects", "1"};
 cvar_t cl_explosions = {CVAR_SAVE, "cl_explosions", "1"};
 cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1"};
 
-mempool_t *cl_scores_mempool;
+cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1"};
+cvar_t cl_beams_relative = {CVAR_SAVE, "cl_beams_relative", "1"};
+cvar_t cl_beams_lightatend = {CVAR_SAVE, "cl_beams_lightatend", "0"};
+
+cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0"};
+
 mempool_t *cl_refdef_mempool;
 mempool_t *cl_entities_mempool;
 
@@ -90,14 +91,13 @@ CL_ClearState
 
 =====================
 */
-void CL_ClearState (void)
+void CL_ClearState(void)
 {
        int i;
 
        if (!sv.active)
                Host_ClearMemory ();
 
-       Mem_EmptyPool(cl_scores_mempool);
        Mem_EmptyPool(cl_entities_mempool);
 
 // wipe the entire cl structure
@@ -153,7 +153,7 @@ Sends a disconnect message to the server
 This is also called on Host_Error, so it shouldn't cause any errors
 =====================
 */
-void CL_Disconnect (void)
+void CL_Disconnect(void)
 {
        if (cls.state == ca_dedicated)
                return;
@@ -170,22 +170,26 @@ void CL_Disconnect (void)
        cl.worldmodel = NULL;
 
        if (cls.demoplayback)
-               CL_StopPlayback ();
-       else if (cls.state == ca_connected)
+               CL_StopPlayback();
+       else if (cls.netcon)
        {
                if (cls.demorecording)
-                       CL_Stop_f ();
-
-               Con_DPrintf ("Sending clc_disconnect\n");
-               SZ_Clear (&cls.message);
-               MSG_WriteByte (&cls.message, clc_disconnect);
-               NET_SendUnreliableMessage (cls.netcon, &cls.message);
-               SZ_Clear (&cls.message);
-               NET_Close (cls.netcon);
-               cls.state = ca_disconnected; // prevent this code from executing again during Host_ShutdownServer
+                       CL_Stop_f();
+
+               Con_DPrintf("Sending clc_disconnect\n");
+               SZ_Clear(&cls.message);
+               MSG_WriteByte(&cls.message, clc_disconnect);
+               NetConn_SendUnreliableMessage(cls.netcon, &cls.message);
+               SZ_Clear(&cls.message);
+               NetConn_Close(cls.netcon);
+               cls.netcon = NULL;
                // if running a local server, shut it down
                if (sv.active)
+               {
+                       // prevent this code from executing again during Host_ShutdownServer
+                       cls.state = ca_disconnected;
                        Host_ShutdownServer(false);
+               }
        }
        cls.state = ca_disconnected;
 
@@ -193,7 +197,7 @@ void CL_Disconnect (void)
        cls.signon = 0;
 }
 
-void CL_Disconnect_f (void)
+void CL_Disconnect_f(void)
 {
        CL_Disconnect ();
        if (sv.active)
@@ -207,29 +211,38 @@ void CL_Disconnect_f (void)
 =====================
 CL_EstablishConnection
 
-Host should be either "local" or a net address to be passed on
+Host should be either "local" or a net address
 =====================
 */
-void CL_EstablishConnection (char *host)
+void CL_EstablishConnection(const char *host)
 {
        if (cls.state == ca_dedicated)
                return;
 
-       if (cls.demoplayback)
-               return;
-
-       CL_Disconnect ();
-
-       cls.netcon = NET_Connect (host);
-       if (!cls.netcon)
-               Host_Error ("CL_Connect: connect failed\n");
-       Con_DPrintf ("CL_EstablishConnection: connected to %s\n", host);
+       // clear menu's connect error message
+       m_return_reason[0] = 0;
 
-       cls.demonum = -1;                       // not in the demo loop now
-       cls.state = ca_connected;
-       cls.signon = 0;                         // need all the signon messages before playing
+       // stop demo loop in case this fails
+       cls.demonum = -1;
+       CL_Disconnect();
 
-       CL_ClearState ();
+       if (LHNETADDRESS_FromString(&cls.connect_address, host, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address)))
+       {
+               cls.connect_trying = true;
+               cls.connect_remainingtries = 3;
+               cls.connect_nextsendtime = 0;
+               if (sv.active)
+               {
+                       NetConn_ClientFrame();
+                       NetConn_ServerFrame();
+                       NetConn_ClientFrame();
+                       NetConn_ServerFrame();
+                       NetConn_ClientFrame();
+                       NetConn_ServerFrame();
+                       NetConn_ClientFrame();
+                       NetConn_ServerFrame();
+               }
+       }
 }
 
 /*
@@ -237,7 +250,7 @@ void CL_EstablishConnection (char *host)
 CL_PrintEntities_f
 ==============
 */
-static void CL_PrintEntities_f (void)
+static void CL_PrintEntities_f(void)
 {
        entity_t *ent;
        int i, j;
@@ -259,76 +272,61 @@ static void CL_PrintEntities_f (void)
        }
 }
 
-static const vec3_t nomodelmins = {-16, -16, -16};
-static const vec3_t nomodelmaxs = {16, 16, 16};
+//static const vec3_t nomodelmins = {-16, -16, -16};
+//static const vec3_t nomodelmaxs = {16, 16, 16};
 void CL_BoundingBoxForEntity(entity_render_t *ent)
 {
        if (ent->model)
        {
-               if (ent->angles[0] || ent->angles[2])
+               //if (ent->angles[0] || ent->angles[2])
+               if (ent->matrix.m[2][0] != 0 || ent->matrix.m[2][1] != 0)
                {
                        // pitch or roll
-                       VectorAdd(ent->origin, ent->model->rotatedmins, ent->mins);
-                       VectorAdd(ent->origin, ent->model->rotatedmaxs, ent->maxs);
+                       ent->mins[0] = ent->matrix.m[0][3] + ent->model->rotatedmins[0];
+                       ent->mins[1] = ent->matrix.m[1][3] + ent->model->rotatedmins[1];
+                       ent->mins[2] = ent->matrix.m[2][3] + ent->model->rotatedmins[2];
+                       ent->maxs[0] = ent->matrix.m[0][3] + ent->model->rotatedmaxs[0];
+                       ent->maxs[1] = ent->matrix.m[1][3] + ent->model->rotatedmaxs[1];
+                       ent->maxs[2] = ent->matrix.m[2][3] + ent->model->rotatedmaxs[2];
+                       //VectorAdd(ent->origin, ent->model->rotatedmins, ent->mins);
+                       //VectorAdd(ent->origin, ent->model->rotatedmaxs, ent->maxs);
                }
-               else if (ent->angles[1])
+               //else if (ent->angles[1])
+               else if (ent->matrix.m[0][1] != 0 || ent->matrix.m[1][0] != 0)
                {
                        // yaw
-                       VectorAdd(ent->origin, ent->model->yawmins, ent->mins);
-                       VectorAdd(ent->origin, ent->model->yawmaxs, ent->maxs);
+                       ent->mins[0] = ent->matrix.m[0][3] + ent->model->yawmins[0];
+                       ent->mins[1] = ent->matrix.m[1][3] + ent->model->yawmins[1];
+                       ent->mins[2] = ent->matrix.m[2][3] + ent->model->yawmins[2];
+                       ent->maxs[0] = ent->matrix.m[0][3] + ent->model->yawmaxs[0];
+                       ent->maxs[1] = ent->matrix.m[1][3] + ent->model->yawmaxs[1];
+                       ent->maxs[2] = ent->matrix.m[2][3] + ent->model->yawmaxs[2];
+                       //VectorAdd(ent->origin, ent->model->yawmins, ent->mins);
+                       //VectorAdd(ent->origin, ent->model->yawmaxs, ent->maxs);
                }
                else
                {
-                       VectorAdd(ent->origin, ent->model->normalmins, ent->mins);
-                       VectorAdd(ent->origin, ent->model->normalmaxs, ent->maxs);
+                       ent->mins[0] = ent->matrix.m[0][3] + ent->model->normalmins[0];
+                       ent->mins[1] = ent->matrix.m[1][3] + ent->model->normalmins[1];
+                       ent->mins[2] = ent->matrix.m[2][3] + ent->model->normalmins[2];
+                       ent->maxs[0] = ent->matrix.m[0][3] + ent->model->normalmaxs[0];
+                       ent->maxs[1] = ent->matrix.m[1][3] + ent->model->normalmaxs[1];
+                       ent->maxs[2] = ent->matrix.m[2][3] + ent->model->normalmaxs[2];
+                       //VectorAdd(ent->origin, ent->model->normalmins, ent->mins);
+                       //VectorAdd(ent->origin, ent->model->normalmaxs, ent->maxs);
                }
        }
        else
        {
-               VectorAdd(ent->origin, nomodelmins, ent->mins);
-               VectorAdd(ent->origin, nomodelmaxs, ent->maxs);
-       }
-}
-
-void CL_LerpUpdate(entity_t *e)
-{
-       entity_persistent_t *p;
-       entity_render_t *r;
-       p = &e->persistent;
-       r = &e->render;
-
-       if (p->modelindex != e->state_current.modelindex)
-       {
-               // reset all interpolation information
-               p->modelindex = e->state_current.modelindex;
-               p->frame1 = p->frame2 = e->state_current.frame;
-               p->frame1time = p->frame2time = cl.time;
-               p->framelerp = 1;
-       }
-       else if (p->frame2 != e->state_current.frame)
-       {
-               // transition to new frame
-               p->frame1 = p->frame2;
-               p->frame1time = p->frame2time;
-               p->frame2 = e->state_current.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);
+               ent->mins[0] = ent->matrix.m[0][3] - 16;
+               ent->mins[1] = ent->matrix.m[1][3] - 16;
+               ent->mins[2] = ent->matrix.m[2][3] - 16;
+               ent->maxs[0] = ent->matrix.m[0][3] + 16;
+               ent->maxs[1] = ent->matrix.m[1][3] + 16;
+               ent->maxs[2] = ent->matrix.m[2][3] + 16;
+               //VectorAdd(ent->origin, nomodelmins, ent->mins);
+               //VectorAdd(ent->origin, nomodelmaxs, ent->maxs);
        }
-
-       r->model = cl.model_precache[e->state_current.modelindex];
-       Mod_CheckLoaded(r->model);
-       r->frame = e->state_current.frame;
-       r->frame1 = p->frame1;
-       r->frame2 = p->frame2;
-       r->framelerp = p->framelerp;
-       r->frame1time = p->frame1time;
-       r->frame2time = p->frame2time;
 }
 
 /*
@@ -339,7 +337,7 @@ Determines the fraction between the last two messages that the objects
 should be put at.
 ===============
 */
-static float CL_LerpPoint (void)
+static float CL_LerpPoint(void)
 {
        float f;
 
@@ -366,7 +364,7 @@ void CL_ClearTempEntities (void)
        cl_num_temp_entities = 0;
 }
 
-entity_t *CL_NewTempEntity (void)
+entity_t *CL_NewTempEntity(void)
 {
        entity_t *ent;
 
@@ -384,7 +382,32 @@ entity_t *CL_NewTempEntity (void)
        return ent;
 }
 
-void CL_AllocDlight (entity_render_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime)
+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_effects;i < cl_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;
+       }
+}
+
+void CL_AllocDlight(entity_render_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime)
 {
        int i;
        dlight_t *dl;
@@ -413,7 +436,8 @@ dlightsetup:
        //Con_Printf("dlight %i : %f %f %f : %f %f %f\n", i, org[0], org[1], org[2], red * radius, green * radius, blue * radius);
        memset (dl, 0, sizeof(*dl));
        dl->ent = ent;
-       VectorCopy(org, dl->origin);
+       CL_FindNonSolidLocation(org, dl->origin, 6);
+       //VectorCopy(org, dl->origin);
        dl->radius = radius;
        dl->color[0] = red;
        dl->color[1] = green;
@@ -425,7 +449,7 @@ dlightsetup:
                dl->die = 0;
 }
 
-void CL_DecayLights (void)
+void CL_DecayLights(void)
 {
        int i;
        dlight_t *dl;
@@ -450,336 +474,338 @@ void CL_DecayLights (void)
        }
 }
 
-void CL_RelinkWorld (void)
-{
-       if (cl_num_entities < 1)
-               cl_num_entities = 1;
-       cl_brushmodel_entities[cl_num_brushmodel_entities++] = &cl_entities[0].render;
-       CL_BoundingBoxForEntity(&cl_entities[0].render);
-}
-
-static void CL_RelinkStaticEntities(void)
+extern qboolean Nehahrademcompatibility;
+#define MAXVIEWMODELS 32
+entity_t *viewmodels[MAXVIEWMODELS];
+int numviewmodels;
+void CL_RelinkNetworkEntity(entity_t *e)
 {
-       int i;
-       for (i = 0;i < cl_num_static_entities && r_refdef.numentities < r_refdef.maxentities;i++)
-       {
-               Mod_CheckLoaded(cl_static_entities[i].render.model);
-               r_refdef.entities[r_refdef.numentities++] = &cl_static_entities[i].render;
-       }
-}
-
-/*
-===============
-CL_RelinkEntities
-===============
-*/
-static void CL_RelinkNetworkEntities(void)
-{
-       entity_t *ent;
-       int i, effects, temp;
-       float d, bobjrotate, bobjoffset, lerp;
-       vec3_t oldorg, neworg, delta, dlightcolor, v, v2, mins, maxs;
-
-       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;
+       int trailtype, temp;
+       float oldorg[3], delta[3], lerp, dlightcolor[3], mins[3], maxs[3], v[3], v2[3], d;
+       entity_persistent_t *p;
+       entity_render_t *r;
+       p = &e->persistent;
+       r = &e->render;
 
-       // start on the entity after the world
-       for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS;i++, ent++)
+       if (e->state_previous.active && e->state_current.modelindex == e->state_previous.modelindex)
        {
-               // if the object isn't active in the current network frame, skip it
-               if (!cl_entities_active[i])
-                       continue;
-               if (!ent->state_current.active)
+               // movement lerp
+               if (p->lerpdeltatime > 0 && (lerp = (cl.time - p->lerpstarttime) / p->lerpdeltatime) < 1)
                {
-                       cl_entities_active[i] = false;
-                       continue;
+                       // read the old origin
+                       VectorCopy(r->origin, oldorg);
+                       // interpolate the origin and angles
+                       r->origin[0] = p->oldorigin[0] + lerp * (p->neworigin[0] - p->oldorigin[0]);
+                       r->origin[1] = p->oldorigin[1] + lerp * (p->neworigin[1] - p->oldorigin[1]);
+                       r->origin[2] = p->oldorigin[2] + lerp * (p->neworigin[2] - p->oldorigin[2]);
+                       VectorSubtract(p->newangles, p->oldangles, 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(p->oldangles, lerp, delta, r->angles);
                }
-
-               VectorCopy(ent->persistent.trail_origin, oldorg);
-
-               if (!ent->state_previous.active)
+               else
                {
-                       // only one state available
-                       VectorCopy (ent->persistent.neworigin, neworg);
-                       VectorCopy (ent->persistent.newangles, ent->render.angles);
-                       VectorCopy (neworg, oldorg);
+                       // no interpolation
+                       VectorCopy(p->neworigin, r->origin);
+                       VectorCopy(p->neworigin, oldorg);
+                       VectorCopy(p->newangles, r->angles);
                }
-               else
+               // animation lerp
+               if (r->frame2 != e->state_current.frame)
                {
-                       // if the delta is large, assume a teleport and don't lerp
-                       VectorSubtract(ent->persistent.neworigin, ent->persistent.oldorigin, delta);
-                       if (ent->persistent.lerpdeltatime > 0)
-                       {
-                               lerp = (cl.time - ent->persistent.lerpstarttime) / ent->persistent.lerpdeltatime;
-                               if (lerp < 1)
-                               {
-                                       // interpolate the origin and angles
-                                       VectorMA(ent->persistent.oldorigin, lerp, delta, neworg);
-                                       VectorSubtract(ent->persistent.newangles, ent->persistent.oldangles, 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->persistent.oldangles, lerp, delta, ent->render.angles);
-                               }
-                               else
-                               {
-                                       // no interpolation
-                                       VectorCopy (ent->persistent.neworigin, neworg);
-                                       VectorCopy (ent->persistent.newangles, ent->render.angles);
-                               }
-                       }
-                       else
-                       {
-                               // no interpolation
-                               VectorCopy (ent->persistent.neworigin, neworg);
-                               VectorCopy (ent->persistent.newangles, ent->render.angles);
-                       }
+                       // begin a new frame lerp
+                       r->frame1 = r->frame2;
+                       r->frame1time = r->frame2time;
+                       r->frame = r->frame2 = e->state_current.frame;
+                       r->frame2time = cl.time;
+                       r->framelerp = 0;
                }
-
-               VectorCopy (neworg, ent->persistent.trail_origin);
-               // persistent.modelindex will be updated by CL_LerpUpdate
-               if (ent->state_current.modelindex != ent->persistent.modelindex)
-                       VectorCopy(neworg, oldorg);
-
-               VectorCopy (neworg, ent->render.origin);
-               ent->render.flags = ent->state_current.flags;
-               if (i == cl.viewentity)
-                       ent->render.flags |= RENDER_EXTERIORMODEL;
-               ent->render.effects = effects = ent->state_current.effects;
-               if (ent->state_current.flags & RENDER_COLORMAPPED)
-                       ent->render.colormap = ent->state_current.colormap;
-               else if (cl.scores == NULL || !ent->state_current.colormap)
-                       ent->render.colormap = -1; // no special coloring
                else
-                       ent->render.colormap = cl.scores[ent->state_current.colormap - 1].colors; // color it
-               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?
+               {
+                       // update frame lerp fraction
+                       r->framelerp = r->frame2time > r->frame1time ? ((cl.time - r->frame2time) / (r->frame2time - r->frame1time)) : 1;
+                       r->framelerp = bound(0, r->framelerp, 1);
+               }
+       }
+       else
+       {
+               // no interpolation
+               VectorCopy(p->neworigin, r->origin);
+               VectorCopy(p->neworigin, oldorg);
+               VectorCopy(p->newangles, r->angles);
+               r->frame = r->frame1 = r->frame2 = e->state_current.frame;
+               r->frame1time = r->frame2time = cl.time;
+               r->framelerp = 1;
+       }
 
-               // update interpolation info
-               CL_LerpUpdate(ent);
+       r->alpha = e->state_current.alpha * (1.0f / 255.0f); // FIXME: interpolate?
+       r->scale = e->state_current.scale * (1.0f / 16.0f); // FIXME: interpolate?
+       r->flags = e->state_current.flags;
+       if (e - cl_entities == cl.viewentity)
+               r->flags |= RENDER_EXTERIORMODEL;
+       r->effects = e->state_current.effects;
+       if (e->state_current.flags & RENDER_COLORMAPPED)
+               r->colormap = e->state_current.colormap;
+       else if (cl.scores != NULL && e->state_current.colormap)
+               r->colormap = cl.scores[e->state_current.colormap - 1].colors; // color it
+       else
+               r->colormap = -1; // no special coloring
+       r->skinnum = e->state_current.skin;
 
-               // handle effects now...
-               dlightcolor[0] = 0;
-               dlightcolor[1] = 0;
-               dlightcolor[2] = 0;
+       // handle effects now...
+       trailtype = -1;
+       dlightcolor[0] = 0;
+       dlightcolor[1] = 0;
+       dlightcolor[2] = 0;
 
-               // LordHavoc: if the entity has no effects, don't check each
-               if (effects)
+       // LordHavoc: if the entity has no effects, don't check each
+       if (r->effects)
+       {
+               if (r->effects & EF_BRIGHTFIELD)
                {
-                       if (effects & EF_BRIGHTFIELD)
-                               CL_EntityParticles (ent);
-                       if (effects & EF_MUZZLEFLASH)
-                               ent->persistent.muzzleflash = 100.0f;
-                       if (effects & EF_DIMLIGHT)
+                       if (gamemode == GAME_NEXUIZ)
                        {
-                               dlightcolor[0] += 200.0f;
+                               dlightcolor[0] += 100.0f;
                                dlightcolor[1] += 200.0f;
-                               dlightcolor[2] += 200.0f;
-                       }
-                       if (effects & EF_BRIGHTLIGHT)
-                       {
-                               dlightcolor[0] += 400.0f;
-                               dlightcolor[1] += 400.0f;
                                dlightcolor[2] += 400.0f;
+                               trailtype = 8;
                        }
-                       // LordHavoc: added EF_RED and EF_BLUE
-                       if (effects & EF_RED) // red
-                       {
-                               dlightcolor[0] += 200.0f;
-                               dlightcolor[1] +=  20.0f;
-                               dlightcolor[2] +=  20.0f;
-                       }
-                       if (effects & EF_BLUE) // blue
-                       {
-                               dlightcolor[0] +=  20.0f;
-                               dlightcolor[1] +=  20.0f;
-                               dlightcolor[2] += 200.0f;
-                       }
-                       if (effects & EF_FLAME)
-                       {
-                               if (ent->render.model)
-                               {
-                                       mins[0] = neworg[0] - 16.0f;
-                                       mins[1] = neworg[1] - 16.0f;
-                                       mins[2] = neworg[2] - 16.0f;
-                                       maxs[0] = neworg[0] + 16.0f;
-                                       maxs[1] = neworg[1] + 16.0f;
-                                       maxs[2] = neworg[2] + 16.0f;
-                                       // how many flames to make
-                                       temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300);
-                                       CL_FlameCube(mins, maxs, temp);
-                               }
-                               d = lhrandom(200, 250);
-                               dlightcolor[0] += d * 1.0f;
-                               dlightcolor[1] += d * 0.7f;
-                               dlightcolor[2] += d * 0.3f;
-                       }
-                       if (effects & EF_STARDUST)
-                       {
-                               if (ent->render.model)
-                               {
-                                       mins[0] = neworg[0] - 16.0f;
-                                       mins[1] = neworg[1] - 16.0f;
-                                       mins[2] = neworg[2] - 16.0f;
-                                       maxs[0] = neworg[0] + 16.0f;
-                                       maxs[1] = neworg[1] + 16.0f;
-                                       maxs[2] = neworg[2] + 16.0f;
-                                       // how many particles to make
-                                       temp = (int) (cl.time * 200) - (int) (cl.oldtime * 200);
-                                       CL_Stardust(mins, maxs, temp);
-                               }
-                               d = 100;
-                               dlightcolor[0] += d * 1.0f;
-                               dlightcolor[1] += d * 0.7f;
-                               dlightcolor[2] += d * 0.3f;
-                       }
+                       else
+                               CL_EntityParticles(e);
                }
+               if (r->effects & EF_MUZZLEFLASH)
+                       p->muzzleflash = 100.0f;
+               if (r->effects & EF_DIMLIGHT)
+               {
+                       dlightcolor[0] += 200.0f;
+                       dlightcolor[1] += 200.0f;
+                       dlightcolor[2] += 200.0f;
+               }
+               if (r->effects & EF_BRIGHTLIGHT)
+               {
+                       dlightcolor[0] += 400.0f;
+                       dlightcolor[1] += 400.0f;
+                       dlightcolor[2] += 400.0f;
+               }
+               // LordHavoc: added EF_RED and EF_BLUE
+               if (r->effects & EF_RED) // red
+               {
+                       dlightcolor[0] += 200.0f;
+                       dlightcolor[1] +=  20.0f;
+                       dlightcolor[2] +=  20.0f;
+               }
+               if (r->effects & EF_BLUE) // blue
+               {
+                       dlightcolor[0] +=  20.0f;
+                       dlightcolor[1] +=  20.0f;
+                       dlightcolor[2] += 200.0f;
+               }
+               if (r->effects & EF_FLAME)
+               {
+                       mins[0] = r->origin[0] - 16.0f;
+                       mins[1] = r->origin[1] - 16.0f;
+                       mins[2] = r->origin[2] - 16.0f;
+                       maxs[0] = r->origin[0] + 16.0f;
+                       maxs[1] = r->origin[1] + 16.0f;
+                       maxs[2] = r->origin[2] + 16.0f;
+                       // how many flames to make
+                       temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300);
+                       CL_FlameCube(mins, maxs, temp);
+                       d = lhrandom(200, 250);
+                       dlightcolor[0] += d * 1.0f;
+                       dlightcolor[1] += d * 0.7f;
+                       dlightcolor[2] += d * 0.3f;
+               }
+               if (r->effects & EF_STARDUST)
+               {
+                       mins[0] = r->origin[0] - 16.0f;
+                       mins[1] = r->origin[1] - 16.0f;
+                       mins[2] = r->origin[2] - 16.0f;
+                       maxs[0] = r->origin[0] + 16.0f;
+                       maxs[1] = r->origin[1] + 16.0f;
+                       maxs[2] = r->origin[2] + 16.0f;
+                       // how many particles to make
+                       temp = (int) (cl.time * 200) - (int) (cl.oldtime * 200);
+                       CL_Stardust(mins, maxs, temp);
+                       d = 100;
+                       dlightcolor[0] += d * 1.0f;
+                       dlightcolor[1] += d * 0.7f;
+                       dlightcolor[2] += d * 0.3f;
+               }
+       }
 
-               if (ent->persistent.muzzleflash > 0)
+       r->model = cl.model_precache[e->state_current.modelindex];
+       if (r->model)
+       {
+               Mod_CheckLoaded(r->model);
+               if (r->model->type != mod_brush)
+                       r->angles[0] = -r->angles[0];
+               // LordHavoc: if the model has no flags, don't check each
+               if (r->model->flags & EF_ROTATE)
                {
-                       AngleVectors (ent->render.angles, v, NULL, NULL);
+                       r->angles[1] = ANGLEMOD(100*cl.time);
+                       if (cl_itembobheight.value)
+                               r->origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value;
+               }
+       }
 
-                       v2[0] = v[0] * 18 + neworg[0];
-                       v2[1] = v[1] * 18 + neworg[1];
-                       v2[2] = v[2] * 18 + neworg[2] + 16;
-                       CL_TraceLine(neworg, v2, v, NULL, 0, true, NULL);
+       Matrix4x4_CreateFromQuakeEntity(&r->matrix, r->origin[0], r->origin[1], r->origin[2], r->angles[0], r->angles[1], r->angles[2], r->scale);
+       Matrix4x4_Invert_Simple(&r->inversematrix, &r->matrix);
+       CL_BoundingBoxForEntity(&e->render);
 
-                       CL_AllocDlight (NULL, v, ent->persistent.muzzleflash, 1, 1, 1, 0, 0);
-                       ent->persistent.muzzleflash -= cl.frametime * 1000;
+       // LordHavoc: if the model has no flags, don't check each
+       if (r->model && r->model->flags)
+       {
+               if (r->model->flags & EF_GIB)
+                       trailtype = 2;
+               else if (r->model->flags & EF_ZOMGIB)
+                       trailtype = 4;
+               else if (r->model->flags & EF_TRACER)
+               {
+                       trailtype = 3;
+                       dlightcolor[0] += 0x10;
+                       dlightcolor[1] += 0x40;
+                       dlightcolor[2] += 0x10;
                }
-
-               // LordHavoc: if the model has no flags, don't check each
-               if (ent->render.model && ent->render.model->flags)
+               else if (r->model->flags & EF_TRACER2)
                {
-                       if (ent->render.model->flags & EF_ROTATE)
-                       {
-                               ent->render.angles[1] = bobjrotate;
-                               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)
-                                       CL_RocketTrail (oldorg, neworg, 2, ent);
-                               else if (ent->render.model->flags & EF_ZOMGIB)
-                                       CL_RocketTrail (oldorg, neworg, 4, ent);
-                               else if (ent->render.model->flags & EF_TRACER)
-                               {
-                                       CL_RocketTrail (oldorg, neworg, 3, ent);
-                                       dlightcolor[0] += 0x10;
-                                       dlightcolor[1] += 0x40;
-                                       dlightcolor[2] += 0x10;
-                               }
-                               else if (ent->render.model->flags & EF_TRACER2)
-                               {
-                                       CL_RocketTrail (oldorg, neworg, 5, ent);
-                                       dlightcolor[0] += 0x50;
-                                       dlightcolor[1] += 0x30;
-                                       dlightcolor[2] += 0x10;
-                               }
-                               else if (ent->render.model->flags & EF_ROCKET)
-                               {
-                                       CL_RocketTrail (oldorg, ent->render.origin, 0, ent);
-                                       dlightcolor[0] += 200.0f;
-                                       dlightcolor[1] += 160.0f;
-                                       dlightcolor[2] +=  80.0f;
-                               }
-                               else if (ent->render.model->flags & EF_GRENADE)
-                               {
-                                       if (ent->render.alpha == -1) // LordHavoc: Nehahra dem compatibility (cigar smoke)
-                                               CL_RocketTrail (oldorg, neworg, 7, ent);
-                                       else
-                                               CL_RocketTrail (oldorg, neworg, 1, ent);
-                               }
-                               else if (ent->render.model->flags & EF_TRACER3)
-                               {
-                                       CL_RocketTrail (oldorg, neworg, 6, ent);
-                                       dlightcolor[0] += 0x50;
-                                       dlightcolor[1] += 0x20;
-                                       dlightcolor[2] += 0x40;
-                               }
-                       }
+                       trailtype = 5;
+                       dlightcolor[0] += 0x50;
+                       dlightcolor[1] += 0x30;
+                       dlightcolor[2] += 0x10;
                }
-               // LordHavoc: customizable glow
-               if (ent->state_current.glowsize)
+               else if (r->model->flags & EF_ROCKET)
                {
-                       // * 4 for the expansion from 0-255 to 0-1023 range,
-                       // / 255 to scale down byte colors
-                       VectorMA(dlightcolor, ent->state_current.glowsize * (4.0f / 255.0f), (qbyte *)&palette_complete[ent->state_current.glowcolor], dlightcolor);
+                       trailtype = 0;
+                       dlightcolor[0] += 200.0f;
+                       dlightcolor[1] += 160.0f;
+                       dlightcolor[2] +=  80.0f;
                }
-               // LordHavoc: customizable trail
-               if (ent->render.flags & RENDER_GLOWTRAIL)
-                       CL_RocketTrail2 (oldorg, neworg, ent->state_current.glowcolor, ent);
-
-               if (dlightcolor[0] || dlightcolor[1] || dlightcolor[2])
+               else if (r->model->flags & EF_GRENADE)
+               {
+                       // LordHavoc: r->alpha == -1 is for Nehahra dem compatibility (cigar smoke)
+                       trailtype = r->alpha == -1 ? 7 : 1;
+               }
+               else if (r->model->flags & EF_TRACER3)
                {
-                       VectorCopy(neworg, v);
-                       // hack to make glowing player light shine on their gun
-                       if (i == cl.viewentity/* && !chase_active.integer*/)
-                               v[2] += 30;
-                       CL_AllocDlight (&ent->render, v, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0);
+                       trailtype = 6;
+                       dlightcolor[0] += 0x50;
+                       dlightcolor[1] += 0x20;
+                       dlightcolor[2] += 0x40;
                }
+       }
 
-               if (chase_active.integer && (ent->render.flags & RENDER_VIEWMODEL))
-                       continue;
+       // LordHavoc: customizable glow
+       if (e->state_current.glowsize)
+       {
+               // * 4 for the expansion from 0-255 to 0-1023 range,
+               // / 255 to scale down byte colors
+               VectorMA(dlightcolor, e->state_current.glowsize * (4.0f / 255.0f), (qbyte *)&palette_complete[e->state_current.glowcolor], dlightcolor);
+       }
 
-               // don't show entities with no modelindex (note: this still shows
-               // entities which have a modelindex that resolved to a NULL model)
-               if (!ent->state_current.modelindex)
-                       continue;
-               if (effects & EF_NODRAW)
-                       continue;
+       // trails need a previous frame...
+       if (e->state_previous.active)
+       {
+               // LordHavoc: customizable trail
+               if (r->flags & RENDER_GLOWTRAIL)
+                       CL_RocketTrail2(oldorg, r->origin, e->state_current.glowcolor, e);
+               else if (trailtype >= 0)
+                       CL_RocketTrail(oldorg, r->origin, trailtype, e);
+       }
+
+       if ((dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) && !(r->flags & RENDER_VIEWMODEL))
+       {
+               VectorCopy(r->origin, v);
+               // hack to make glowing player light shine on their gun
+               if ((e - cl_entities) == cl.viewentity/* && !chase_active.integer*/)
+                       v[2] += 30;
+               CL_AllocDlight(r, v, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0);
+       }
 
-               CL_BoundingBoxForEntity(&ent->render);
-               if (ent->render.model && ent->render.model->name[0] == '*' && ent->render.model->type == mod_brush)
-                       cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render;
+       if (p->muzzleflash > 0)
+       {
+               v2[0] = r->matrix.m[0][0] * 18 + r->matrix.m[0][3];
+               v2[1] = r->matrix.m[0][1] * 18 + r->matrix.m[1][3];
+               v2[2] = r->matrix.m[0][2] * 18 + r->matrix.m[2][3];
+               CL_TraceLine(r->origin, v2, v, NULL, 0, true, NULL);
 
-               if (r_refdef.numentities < r_refdef.maxentities)
-                       r_refdef.entities[r_refdef.numentities++] = &ent->render;
+               CL_AllocDlight(NULL, v, p->muzzleflash, 1, 1, 1, 0, 0);
+               p->muzzleflash -= cl.frametime * 1000;
+       }
 
-               if (cl_num_entities < i + 1)
-                       cl_num_entities = i + 1;
+       // note: the cl.viewentity and intermission check is to hide player
+       // shadow during intermission and during the Nehahra movie and
+       // Nehahra cinematics
+       if (!(r->effects & (EF_NOSHADOW | EF_ADDITIVE))
+        && (r->alpha == 1)
+        && !(r->flags & RENDER_VIEWMODEL)
+        && ((e - cl_entities) != cl.viewentity || (!cl.intermission && !Nehahrademcompatibility && !cl_noplayershadow.integer)))
+               r->flags |= RENDER_SHADOW;
+
+       // don't show entities with no modelindex (note: this still shows
+       // entities which have a modelindex that resolved to a NULL model)
+       if (r->model && !(r->effects & EF_NODRAW))
+       {
+               if (r->flags & RENDER_VIEWMODEL)
+               {
+                       // store a list of view-relative entities for later adjustment in view code
+                       if (numviewmodels < MAXVIEWMODELS)
+                               viewmodels[numviewmodels++] = e;
+               }
+               else
+               {
+                       if (r->model->name[0] == '*' && r->model->type == mod_brush)
+                               cl_brushmodel_entities[cl_num_brushmodel_entities++] = &e->render;
+                       if (r_refdef.numentities < r_refdef.maxentities)
+                               r_refdef.entities[r_refdef.numentities++] = &e->render;
+                       if (cl_num_entities < e->state_current.number + 1)
+                               cl_num_entities = e->state_current.number + 1;
+               }
        }
 }
 
-static void CL_RelinkViewModel(void)
+void CL_RelinkWorld (void)
 {
-       entity_t *ent;
-       if (!r_drawviewmodel.integer || chase_active.integer || envmap || !r_drawentities.integer || cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0 || cl.viewent.render.model == NULL)
-               return;
-
-       ent = &cl.viewent;
-       // FIXME: set up view model here?
-       if (r_refdef.numentities < r_refdef.maxentities)
-               r_refdef.entities[r_refdef.numentities++] = &ent->render;
+       entity_t *ent = &cl_entities[0];
+       if (cl_num_entities < 1)
+               cl_num_entities = 1;
+       cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render;
+       Matrix4x4_CreateIdentity(&ent->render.matrix);
+       Matrix4x4_CreateIdentity(&ent->render.inversematrix);
+       CL_BoundingBoxForEntity(&ent->render);
 }
 
-void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate)
+static void CL_RelinkStaticEntities(void)
 {
        int i;
-       cl_effect_t *e;
-       if (!modelindex) // sanity check
-               return;
-       for (i = 0, e = cl_effects;i < cl_max_effects;i++, e++)
+       for (i = 0;i < cl_num_static_entities && r_refdef.numentities < r_refdef.maxentities;i++)
        {
-               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;
+               Mod_CheckLoaded(cl_static_entities[i].render.model);
+               r_refdef.entities[r_refdef.numentities++] = &cl_static_entities[i].render;
+       }
+}
 
-               e->frame = 0;
-               e->frame1time = cl.time;
-               e->frame2time = cl.time;
-               break;
+/*
+===============
+CL_RelinkEntities
+===============
+*/
+static void CL_RelinkNetworkEntities(void)
+{
+       entity_t *ent;
+       int i;
+
+       // start on the entity after the world
+       for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS;i++, ent++)
+       {
+               if (cl_entities_active[i])
+               {
+                       if (ent->state_current.active)
+                               CL_RelinkNetworkEntity(ent);
+                       else
+                               cl_entities_active[i] = false;
+               }
        }
 }
 
@@ -798,7 +824,6 @@ static void CL_RelinkEffects(void)
                        intframe = frame;
                        if (intframe < 0 || intframe >= e->endframe)
                        {
-                               e->active = false;
                                memset(e, 0, sizeof(*e));
                                continue;
                        }
@@ -824,20 +849,20 @@ static void CL_RelinkEffects(void)
                                ent->render.frame2time = e->frame2time;
 
                                // normal stuff
-                               VectorCopy(e->origin, ent->render.origin);
                                ent->render.model = cl.model_precache[e->modelindex];
                                ent->render.frame = ent->render.frame2;
                                ent->render.colormap = -1; // no special coloring
-                               ent->render.scale = 1;
                                ent->render.alpha = 1;
 
+                               Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, e->origin[0], e->origin[1], e->origin[2], 0, 0, 0, 1);
+                               Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
                                CL_BoundingBoxForEntity(&ent->render);
                        }
                }
        }
 }
 
-void CL_RelinkBeams (void)
+void CL_RelinkBeams(void)
 {
        int i;
        beam_t *b;
@@ -855,10 +880,47 @@ void CL_RelinkBeams (void)
                // if coming from the player, update the start position
                //if (b->entity == cl.viewentity)
                //      VectorCopy (cl_entities[cl.viewentity].render.origin, b->start);
-               if (b->entity && cl_entities[b->entity].state_current.active)
+               if (cl_beams_relative.integer && b->entity && cl_entities[b->entity].state_current.active && b->relativestartvalid)
+               {
+                       entity_state_t *p = &cl_entities[b->entity].state_previous;
+                       //entity_state_t *c = &cl_entities[b->entity].state_current;
+                       entity_render_t *r = &cl_entities[b->entity].render;
+                       matrix4x4_t matrix, imatrix;
+                       if (b->relativestartvalid == 2)
+                       {
+                               // not really valid yet, we need to get the orientation now
+                               // (ParseBeam flagged this because it is received before
+                               //  entities are received, by now they have been received)
+                               // note: because players create lightning in their think
+                               // function (which occurs before movement), they actually
+                               // have some lag in it's location, so compare to the
+                               // previous player state, not the latest
+                               if (b->entity == cl.viewentity)
+                                       Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2] + 16, cl.viewangles[0], cl.viewangles[1], cl.viewangles[2], 1);
+                               else
+                                       Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2] + 16, p->angles[0], p->angles[1], p->angles[2], 1);
+                               Matrix4x4_Invert_Simple(&imatrix, &matrix);
+                               Matrix4x4_Transform(&imatrix, b->start, b->relativestart);
+                               Matrix4x4_Transform(&imatrix, b->end, b->relativeend);
+                               b->relativestartvalid = 1;
+                       }
+                       else
+                       {
+                               if (b->entity == cl.viewentity)
+                                       Matrix4x4_CreateFromQuakeEntity(&matrix, r->origin[0], r->origin[1], r->origin[2] + 16, cl.viewangles[0], cl.viewangles[1], cl.viewangles[2], 1);
+                               else
+                                       Matrix4x4_CreateFromQuakeEntity(&matrix, r->origin[0], r->origin[1], r->origin[2] + 16, r->angles[0], r->angles[1], r->angles[2], 1);
+                               Matrix4x4_Transform(&matrix, b->relativestart, b->start);
+                               Matrix4x4_Transform(&matrix, b->relativeend, b->end);
+                       }
+               }
+
+               if (b->lightning)
                {
-                       VectorCopy (cl_entities[b->entity].render.origin, b->start);
-                       b->start[2] += 16;
+                       if (cl_beams_lightatend.integer)
+                               CL_AllocDlight (NULL, b->end, 200, 0.3, 0.7, 1, 0, 0);
+                       if (cl_beams_polygons.integer)
+                               continue;
                }
 
                // calculate pitch and yaw
@@ -892,12 +954,14 @@ void CL_RelinkBeams (void)
                        ent = CL_NewTempEntity ();
                        if (!ent)
                                return;
-                       VectorCopy (org, ent->render.origin);
+                       //VectorCopy (org, ent->render.origin);
                        ent->render.model = b->model;
                        ent->render.effects = EF_FULLBRIGHT;
-                       ent->render.angles[0] = pitch;
-                       ent->render.angles[1] = yaw;
-                       ent->render.angles[2] = rand()%360;
+                       //ent->render.angles[0] = pitch;
+                       //ent->render.angles[1] = yaw;
+                       //ent->render.angles[2] = rand()%360;
+                       Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, org[0], org[1], org[2], -pitch, yaw, lhrandom(0, 360), 1);
+                       Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
                        CL_BoundingBoxForEntity(&ent->render);
                        VectorMA(org, 30, dist, org);
                        d -= 30;
@@ -909,15 +973,7 @@ void CL_LerpPlayer(float frac)
 {
        int i;
        float d;
-
-       if (cl.entitydatabase.numframes && cl.viewentity == cl.playerentity)
-       {
-               cl.viewentorigin[0] = cl.viewentoriginold[0] + frac * (cl.viewentoriginnew[0] - cl.viewentoriginold[0]);
-               cl.viewentorigin[1] = cl.viewentoriginold[1] + frac * (cl.viewentoriginnew[1] - cl.viewentoriginold[1]);
-               cl.viewentorigin[2] = cl.viewentoriginold[2] + frac * (cl.viewentoriginnew[2] - cl.viewentoriginold[2]);
-       }
-       else
-               VectorCopy (cl_entities[cl.viewentity].render.origin, cl.viewentorigin);
+       entity_t *ent;
 
        cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold);
 
@@ -937,12 +993,31 @@ void CL_LerpPlayer(float frac)
                        cl.viewangles[i] = cl.mviewangles[1][i] + frac * d;
                }
        }
+
+       // set up gun
+       ent = &cl.viewent;
+       ent->state_previous = ent->state_current;
+       ClearStateToDefault(&ent->state_current);
+       ent->state_current.time = cl.time;
+       ent->state_current.number = -1;
+       ent->state_current.active = true;
+       ent->state_current.modelindex = cl.stats[STAT_WEAPON];
+       ent->state_current.frame = cl.stats[STAT_WEAPONFRAME];
+       if (cl.viewentity >= 0 && cl.viewentity < MAX_EDICTS && cl_entities[cl.viewentity].state_current.active)
+       {
+               ent->state_current.alpha = cl_entities[cl.viewentity].state_current.alpha;
+               ent->state_current.effects = cl_entities[cl.viewentity].state_current.effects;
+       }
+       ent->state_current.flags = RENDER_VIEWMODEL;
+       CL_RelinkNetworkEntity(ent);
 }
 
-void CL_RelinkEntities (void)
+void CL_RelinkEntities(void)
 {
        float frac;
 
+       numviewmodels = 0;
+
        // fraction from previous network update to current
        frac = CL_LerpPoint();
 
@@ -951,12 +1026,12 @@ void CL_RelinkEntities (void)
        CL_RelinkWorld();
        CL_RelinkStaticEntities();
        CL_RelinkNetworkEntities();
-       CL_RelinkViewModel();
        CL_RelinkEffects();
-       CL_RelinkBeams();
        CL_MoveParticles();
 
        CL_LerpPlayer(frac);
+
+       CL_RelinkBeams();
 }
 
 
@@ -967,33 +1042,9 @@ CL_ReadFromServer
 Read all incoming data from the server
 ===============
 */
-int CL_ReadFromServer (void)
+int CL_ReadFromServer(void)
 {
-       int ret, netshown;
-
-       cl.oldtime = cl.time;
-       cl.time += cl.frametime;
-
-       netshown = false;
-       do
-       {
-               ret = CL_GetMessage ();
-               if (ret == -1)
-                       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);
-
-       if (netshown)
-               Con_Printf ("\n");
+       CL_ReadDemoMessage();
 
        r_refdef.numentities = 0;
        cl_num_entities = 0;
@@ -1001,15 +1052,12 @@ int CL_ReadFromServer (void)
 
        if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
-               CL_RelinkEntities ();
+               CL_RelinkEntities();
 
                // run cgame code (which can add more entities)
                CL_CGVM_Frame();
        }
 
-//
-// bring the links up to date
-//
        return 0;
 }
 
@@ -1018,78 +1066,46 @@ int CL_ReadFromServer (void)
 CL_SendCmd
 =================
 */
-void CL_SendCmd (void)
+void CL_SendCmd(void)
 {
-       usercmd_t               cmd;
-
-       if (cls.state != ca_connected)
-               return;
+       usercmd_t cmd;
 
        if (cls.signon == SIGNONS)
        {
-       // get basic movement from keyboard
-               CL_BaseMove (&cmd);
+               // get basic movement from keyboard
+               CL_BaseMove(&cmd);
 
-               IN_PreMove(); // OS independent code
+               // OS independent code
+               IN_PreMove();
 
-       // allow mice or other external controllers to add to the move
-               IN_Move (&cmd);
+               // allow mice or other external controllers to add to the move
+               IN_Move(&cmd);
 
-               IN_PostMove(); // OS independent code
+               // OS independent code
+               IN_PostMove();
 
-       // send the unreliable message
-               CL_SendMove (&cmd);
-       }
-#ifndef NOROUTINGFIX
-       else if (cls.signon == 0 && !cls.demoplayback)
-       {
-               // LordHavoc: fix for NAT routing of netquake:
-               // bounce back a clc_nop message to the newly allocated server port,
-               // to establish a routing connection for incoming frames,
-               // the server waits for this before sending anything
-               if (realtime > cl.sendnoptime)
-               {
-                       cl.sendnoptime = realtime + 3;
-                       Con_DPrintf("sending clc_nop to get server's attention\n");
-                       {
-                               sizebuf_t buf;
-                               qbyte data[128];
-                               buf.maxsize = 128;
-                               buf.cursize = 0;
-                               buf.data = data;
-                               MSG_WriteByte(&buf, clc_nop);
-                               if (NET_SendUnreliableMessage (cls.netcon, &buf) == -1)
-                               {
-                                       Con_Printf ("CL_SendCmd: lost server connection\n");
-                                       CL_Disconnect ();
-                               }
-                       }
-               }
+               // send the unreliable message
+               CL_SendMove(&cmd);
        }
-#endif
 
        if (cls.demoplayback)
        {
-               SZ_Clear (&cls.message);
+               SZ_Clear(&cls.message);
                return;
        }
 
-// send the reliable message
-       if (!cls.message.cursize)
-               return;         // no message at all
-
-       if (!NET_CanSendMessage (cls.netcon))
+       // send the reliable message (forwarded commands) if there is one
+       if (cls.message.cursize && NetConn_CanSendMessage(cls.netcon))
        {
-               Con_DPrintf ("CL_WriteToServer: can't send\n");
                if (developer.integer)
+               {
+                       Con_Printf("CL_SendCmd: sending reliable message:\n");
                        SZ_HexDumpToConsole(&cls.message);
-               return;
+               }
+               if (NetConn_SendReliableMessage(cls.netcon, &cls.message) == -1)
+                       Host_Error("CL_WriteToServer: lost server connection");
+               SZ_Clear(&cls.message);
        }
-
-       if (NET_SendMessage (cls.netcon, &cls.message) == -1)
-               Host_Error ("CL_WriteToServer: lost server connection");
-
-       SZ_Clear (&cls.message);
 }
 
 // LordHavoc: pausedemo command
@@ -1102,39 +1118,6 @@ static void CL_PauseDemo_f (void)
                Con_Printf("Demo unpaused\n");
 }
 
-/*
-======================
-CL_PModel_f
-LordHavoc: Intended for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
-======================
-*/
-static void CL_PModel_f (void)
-{
-       int i;
-       eval_t *val;
-
-       if (Cmd_Argc () == 1)
-       {
-               Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
-               return;
-       }
-       i = atoi(Cmd_Argv(1));
-
-       if (cmd_source == src_command)
-       {
-               if (cl_pmodel.integer == i)
-                       return;
-               Cvar_SetValue ("_cl_pmodel", i);
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
-               return;
-       }
-
-       host_client->pmodel = i;
-       if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
-               val->_float = i;
-}
-
 /*
 ======================
 CL_Fog_f
@@ -1160,7 +1143,6 @@ CL_Init
 */
 void CL_Init (void)
 {
-       cl_scores_mempool = Mem_AllocPool("client player info");
        cl_entities_mempool = Mem_AllocPool("client entities");
        cl_refdef_mempool = Mem_AllocPool("refdef");
 
@@ -1180,10 +1162,6 @@ void CL_Init (void)
 //
 // register our commands
 //
-       Cvar_RegisterVariable (&cl_name);
-       Cvar_RegisterVariable (&cl_color);
-       if (gamemode == GAME_NEHAHRA)
-               Cvar_RegisterVariable (&cl_pmodel);
        Cvar_RegisterVariable (&cl_upspeed);
        Cvar_RegisterVariable (&cl_forwardspeed);
        Cvar_RegisterVariable (&cl_backspeed);
@@ -1218,12 +1196,14 @@ void CL_Init (void)
 
        // LordHavoc: added pausedemo
        Cmd_AddCommand ("pausedemo", CL_PauseDemo_f);
-       if (gamemode == GAME_NEHAHRA)
-               Cmd_AddCommand ("pmodel", CL_PModel_f);
 
        Cvar_RegisterVariable(&r_draweffects);
        Cvar_RegisterVariable(&cl_explosions);
        Cvar_RegisterVariable(&cl_stainmaps);
+       Cvar_RegisterVariable(&cl_beams_polygons);
+       Cvar_RegisterVariable(&cl_beams_relative);
+       Cvar_RegisterVariable(&cl_beams_lightatend);
+       Cvar_RegisterVariable(&cl_noplayershadow);
 
        CL_Parse_Init();
        CL_Particles_Init();