]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_main.c
renamed varray_ arrays to rsurface_array_, and they are no longer used outside the...
[xonotic/darkplaces.git] / cl_main.c
index 3151111e052ae138bc2e670d05a7d35d5ef4b7a3..aea2bbde938107ad051c84a933ac2bc8a83c3040 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -29,89 +29,54 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // we need to declare some mouse variables here, because the menu system
 // references them even when on a unix system.
 
-cvar_t csqc_progname = {0, "csqc_progname","csprogs.dat"};     //[515]: csqc crc check and right csprogs name according to progs.dat
-cvar_t csqc_progcrc = {CVAR_READONLY, "csqc_progcrc","0"};
+cvar_t csqc_progname = {0, "csqc_progname","csprogs.dat","name of csprogs.dat file to load"};  //[515]: csqc crc check and right csprogs name according to progs.dat
+cvar_t csqc_progcrc = {CVAR_READONLY, "csqc_progcrc","0","CRC of csprogs.dat file to load"};
 
-cvar_t cl_shownet = {0, "cl_shownet","0"};
-cvar_t cl_nolerp = {0, "cl_nolerp", "0"};
+cvar_t cl_shownet = {0, "cl_shownet","0","1 = print packet size, 2 = print packet message list"};
+cvar_t cl_nolerp = {0, "cl_nolerp", "0","network update smoothing"};
 
-cvar_t cl_itembobheight = {0, "cl_itembobheight", "0"}; // try 8
-cvar_t cl_itembobspeed = {0, "cl_itembobspeed", "0.5"};
+cvar_t cl_itembobheight = {0, "cl_itembobheight", "0","how much items bob up and down (try 8)"};
+cvar_t cl_itembobspeed = {0, "cl_itembobspeed", "0.5","how frequently items bob up and down"};
 
-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 lookspring = {CVAR_SAVE, "lookspring","0","returns pitch to level with the floor when no longer holding a pitch key"};
+cvar_t lookstrafe = {CVAR_SAVE, "lookstrafe","0","move instead of turning"};
+cvar_t sensitivity = {CVAR_SAVE, "sensitivity","3","mouse speed multiplier"};
 
-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 m_pitch = {CVAR_SAVE, "m_pitch","0.022","mouse pitch speed multiplier"};
+cvar_t m_yaw = {CVAR_SAVE, "m_yaw","0.022","mouse yaw speed multiplier"};
+cvar_t m_forward = {CVAR_SAVE, "m_forward","1","mouse forward speed multiplier"};
+cvar_t m_side = {CVAR_SAVE, "m_side","0.8","mouse side speed multiplier"};
 
-cvar_t freelook = {CVAR_SAVE, "freelook", "1"};
+cvar_t freelook = {CVAR_SAVE, "freelook", "1","mouse controls pitch instead of forward/back"};
 
-cvar_t r_draweffects = {0, "r_draweffects", "1"};
+cvar_t r_draweffects = {0, "r_draweffects", "1","renders temporary sprite effects"};
 
-cvar_t cl_explosions_alpha_start = {CVAR_SAVE, "cl_explosions_alpha_start", "1.5"};
-cvar_t cl_explosions_alpha_end = {CVAR_SAVE, "cl_explosions_alpha_end", "0"};
-cvar_t cl_explosions_size_start = {CVAR_SAVE, "cl_explosions_size_start", "16"};
-cvar_t cl_explosions_size_end = {CVAR_SAVE, "cl_explosions_size_end", "128"};
-cvar_t cl_explosions_lifetime = {CVAR_SAVE, "cl_explosions_lifetime", "0.5"};
+cvar_t cl_explosions_alpha_start = {CVAR_SAVE, "cl_explosions_alpha_start", "1.5","starting alpha of an explosion shell"};
+cvar_t cl_explosions_alpha_end = {CVAR_SAVE, "cl_explosions_alpha_end", "0","end alpha of an explosion shell (just before it disappears)"};
+cvar_t cl_explosions_size_start = {CVAR_SAVE, "cl_explosions_size_start", "16","starting size of an explosion shell"};
+cvar_t cl_explosions_size_end = {CVAR_SAVE, "cl_explosions_size_end", "128","ending alpha of an explosion shell (just before it disappears)"};
+cvar_t cl_explosions_lifetime = {CVAR_SAVE, "cl_explosions_lifetime", "0.5","how long an explosion shell lasts"};
 
-cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1"};
-cvar_t cl_stainmaps_clearonload = {CVAR_SAVE, "cl_stainmaps_clearonload", "1"};
+cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1","stains lightmaps, much faster than decals but blurred"};
+cvar_t cl_stainmaps_clearonload = {CVAR_SAVE, "cl_stainmaps_clearonload", "1","clear stainmaps on map restart"};
 
-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_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1","use beam polygons instead of models"};
+cvar_t cl_beams_relative = {CVAR_SAVE, "cl_beams_relative", "1","beams are relative to owner (smooth sweeps)"};
+cvar_t cl_beams_lightatend = {CVAR_SAVE, "cl_beams_lightatend", "0","make a light at the end of the beam"};
 
-cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0"};
+cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0","hide player shadow"};
 
-cvar_t cl_prydoncursor = {0, "cl_prydoncursor", "0"};
+cvar_t qport = {0, "qport", "0", "identification key for playing on qw servers (allows you to maintain a connection to a quakeworld server even if your port changes)"};
 
-cvar_t cl_deathnoviewmodel = {0, "cl_deathnoviewmodel", "1"};
+cvar_t cl_prydoncursor = {0, "cl_prydoncursor", "0", "enables a mouse pointer which is able to click on entities in the world, useful for point and click mods, see PRYDON_CLIENTCURSOR extension in dpextensions.qc"};
 
-vec3_t cl_playerstandmins;
-vec3_t cl_playerstandmaxs;
-vec3_t cl_playercrouchmins;
-vec3_t cl_playercrouchmaxs;
-
-mempool_t *cl_mempool;
+cvar_t cl_deathnoviewmodel = {0, "cl_deathnoviewmodel", "1", "hides gun model when dead"};
 
 client_static_t        cls;
 client_state_t cl;
 
-int cl_max_entities;
-int cl_max_csqcentities;
-int cl_max_static_entities;
-int cl_max_temp_entities;
-int cl_max_effects;
-int cl_max_beams;
-int cl_max_dlights;
-int cl_max_lightstyle;
-int cl_max_brushmodel_entities;
-int cl_activedlights;
-
-entity_t *cl_entities;
-entity_t *cl_csqcentities;     //[515]: csqc
-unsigned char *cl_entities_active;
-unsigned char *cl_csqcentities_active; //[515]: csqc
-entity_t *cl_static_entities;
-entity_t *cl_temp_entities;
-cl_effect_t *cl_effects;
-beam_t *cl_beams;
-dlight_t *cl_dlights;
-lightstyle_t *cl_lightstyle;
-int *cl_brushmodel_entities;
-
-int cl_num_entities;
-int cl_num_csqcentities;       //[515]: csqc
-int cl_num_static_entities;
-int cl_num_temp_entities;
-int cl_num_brushmodel_entities;
-
-// keep track of quake entities because they need to be killed if they get stale
-extern int cl_lastquakeentity;
-extern unsigned char cl_isquakeentity[MAX_EDICTS];
+#define MAX_PARTICLES                  32768   // default max # of particles at one time
+#define ABSOLUTE_MIN_PARTICLES 512             // no fewer than this no matter what's on the command line
 
 /*
 =====================
@@ -122,123 +87,138 @@ CL_ClearState
 void CL_ClearState(void)
 {
        int i;
-
-       if (cl_entities) Mem_Free(cl_entities);cl_entities = NULL;
-       if (cl_csqcentities) Mem_Free(cl_csqcentities);cl_csqcentities = NULL;  //[515]: csqc
-       if (cl_entities_active) Mem_Free(cl_entities_active);cl_entities_active = NULL;
-       if (cl_csqcentities_active) Mem_Free(cl_csqcentities_active);cl_csqcentities_active = NULL;     //[515]: csqc
-       if (cl_static_entities) Mem_Free(cl_static_entities);cl_static_entities = NULL;
-       if (cl_temp_entities) Mem_Free(cl_temp_entities);cl_temp_entities = NULL;
-       if (cl_effects) Mem_Free(cl_effects);cl_effects = NULL;
-       if (cl_beams) Mem_Free(cl_beams);cl_beams = NULL;
-       if (cl_dlights) Mem_Free(cl_dlights);cl_dlights = NULL;
-       if (cl_lightstyle) Mem_Free(cl_lightstyle);cl_lightstyle = NULL;
-       if (cl_brushmodel_entities) Mem_Free(cl_brushmodel_entities);cl_brushmodel_entities = NULL;
-       if (cl.entitydatabase) EntityFrame_FreeDatabase(cl.entitydatabase);cl.entitydatabase = NULL;
-       if (cl.entitydatabase4) EntityFrame4_FreeDatabase(cl.entitydatabase4);cl.entitydatabase4 = NULL;
-       if (cl.scores) Mem_Free(cl.scores);cl.scores = NULL;
-
-       if (!sv.active)
-               Host_ClearMemory ();
+       entity_t *ent;
 
 // wipe the entire cl structure
+       Mem_EmptyPool(cls.levelmempool);
        memset (&cl, 0, sizeof(cl));
+
+       S_StopAllSounds();
+
        // reset the view zoom interpolation
        cl.mviewzoom[0] = cl.mviewzoom[1] = 1;
 
-       SZ_Clear (&cls.message);
-
-       cl_num_entities = 0;
-       cl_num_csqcentities = 0;        //[515]: csqc
-       cl_num_static_entities = 0;
-       cl_num_temp_entities = 0;
-       cl_num_brushmodel_entities = 0;
+       cl.num_entities = 0;
+       cl.num_csqcentities = 0;        //[515]: csqc
+       cl.num_static_entities = 0;
+       cl.num_temp_entities = 0;
+       cl.num_brushmodel_entities = 0;
 
        // tweak these if the game runs out
-       cl_max_entities = 256;
-       cl_max_csqcentities = 256;      //[515]: csqc
-       cl_max_static_entities = 256;
-       cl_max_temp_entities = 512;
-       cl_max_effects = 256;
-       cl_max_beams = 256;
-       cl_max_dlights = MAX_DLIGHTS;
-       cl_max_lightstyle = MAX_LIGHTSTYLES;
-       cl_max_brushmodel_entities = MAX_EDICTS;
-       cl_activedlights = 0;
-
-       cl_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t));
-       cl_csqcentities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_csqcentities * sizeof(entity_t));    //[515]: csqc
-       cl_entities_active = (unsigned char *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(unsigned char));
-       cl_csqcentities_active = (unsigned char *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(unsigned char));    //[515]: csqc
-       cl_static_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_static_entities * sizeof(entity_t));
-       cl_temp_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_temp_entities * sizeof(entity_t));
-       cl_effects = (cl_effect_t *)Mem_Alloc(cl_mempool, cl_max_effects * sizeof(cl_effect_t));
-       cl_beams = (beam_t *)Mem_Alloc(cl_mempool, cl_max_beams * sizeof(beam_t));
-       cl_dlights = (dlight_t *)Mem_Alloc(cl_mempool, cl_max_dlights * sizeof(dlight_t));
-       cl_lightstyle = (lightstyle_t *)Mem_Alloc(cl_mempool, cl_max_lightstyle * sizeof(lightstyle_t));
-       cl_brushmodel_entities = (int *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(int));
-
-       cl_lastquakeentity = 0;
-       memset(cl_isquakeentity, 0, sizeof(cl_isquakeentity));
+       cl.max_entities = 256;
+       cl.max_csqcentities = 256;      //[515]: csqc
+       cl.max_static_entities = 256;
+       cl.max_temp_entities = 512;
+       cl.max_effects = 256;
+       cl.max_beams = 256;
+       cl.max_dlights = MAX_DLIGHTS;
+       cl.max_lightstyle = MAX_LIGHTSTYLES;
+       cl.max_brushmodel_entities = MAX_EDICTS;
+       cl.max_particles = MAX_PARTICLES;
+
+// COMMANDLINEOPTION: Client: -particles <number> changes maximum number of particles at once, default 32768
+       i = COM_CheckParm ("-particles");
+       if (i && i < com_argc - 1)
+       {
+               cl.max_particles = (int)(atoi(com_argv[i+1]));
+               if (cl.max_particles < ABSOLUTE_MIN_PARTICLES)
+                       cl.max_particles = ABSOLUTE_MIN_PARTICLES;
+       }
+
+       cl.num_dlights = 0;
+       cl.num_effects = 0;
+       cl.num_beams = 0;
+
+       cl.entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_entities * sizeof(entity_t));
+       cl.csqcentities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t));      //[515]: csqc
+       cl.entities_active = (unsigned char *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(unsigned char));
+       cl.csqcentities_active = (unsigned char *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(unsigned char));      //[515]: csqc
+       cl.static_entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_static_entities * sizeof(entity_t));
+       cl.temp_entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_temp_entities * sizeof(entity_t));
+       cl.effects = (cl_effect_t *)Mem_Alloc(cls.levelmempool, cl.max_effects * sizeof(cl_effect_t));
+       cl.beams = (beam_t *)Mem_Alloc(cls.levelmempool, cl.max_beams * sizeof(beam_t));
+       cl.dlights = (dlight_t *)Mem_Alloc(cls.levelmempool, cl.max_dlights * sizeof(dlight_t));
+       cl.lightstyle = (lightstyle_t *)Mem_Alloc(cls.levelmempool, cl.max_lightstyle * sizeof(lightstyle_t));
+       cl.brushmodel_entities = (int *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(int));
+       cl.particles = (particle_t *) Mem_Alloc(cls.levelmempool, cl.max_particles * sizeof(particle_t));
 
        // LordHavoc: have to set up the baseline info for alpha and other stuff
-       for (i = 0;i < cl_max_entities;i++)
+       for (i = 0;i < cl.max_entities;i++)
        {
-               cl_entities[i].state_baseline = defaultstate;
-               cl_entities[i].state_previous = defaultstate;
-               cl_entities[i].state_current = defaultstate;
+               cl.entities[i].state_baseline = defaultstate;
+               cl.entities[i].state_previous = defaultstate;
+               cl.entities[i].state_current = defaultstate;
        }
 
-       for (i = 0;i < cl_max_csqcentities;i++)
+       for (i = 0;i < cl.max_csqcentities;i++)
        {
-               cl_csqcentities[i].state_baseline = defaultstate;       //[515]: csqc
-               cl_csqcentities[i].state_previous = defaultstate;       //[515]: csqc
-               cl_csqcentities[i].state_current = defaultstate;        //[515]: csqc
-               cl_csqcentities[i].csqc = true;
-               cl_csqcentities[i].state_current.number = -i;
+               cl.csqcentities[i].state_baseline = defaultstate;       //[515]: csqc
+               cl.csqcentities[i].state_previous = defaultstate;       //[515]: csqc
+               cl.csqcentities[i].state_current = defaultstate;        //[515]: csqc
+               cl.csqcentities[i].csqc = true;
+               cl.csqcentities[i].state_current.number = -i;
        }
 
        if (gamemode == GAME_NEXUIZ)
        {
-               VectorSet(cl_playerstandmins, -16, -16, -24);
-               VectorSet(cl_playerstandmaxs, 16, 16, 45);
-               VectorSet(cl_playercrouchmins, -16, -16, -24);
-               VectorSet(cl_playercrouchmaxs, 16, 16, 25);
+               VectorSet(cl.playerstandmins, -16, -16, -24);
+               VectorSet(cl.playerstandmaxs, 16, 16, 45);
+               VectorSet(cl.playercrouchmins, -16, -16, -24);
+               VectorSet(cl.playercrouchmaxs, 16, 16, 25);
        }
        else
        {
-               VectorSet(cl_playerstandmins, -16, -16, -24);
-               VectorSet(cl_playerstandmaxs, 16, 16, 24);
-               VectorSet(cl_playercrouchmins, -16, -16, -24);
-               VectorSet(cl_playercrouchmaxs, 16, 16, 24);
+               VectorSet(cl.playerstandmins, -16, -16, -24);
+               VectorSet(cl.playerstandmaxs, 16, 16, 24);
+               VectorSet(cl.playercrouchmins, -16, -16, -24);
+               VectorSet(cl.playercrouchmaxs, 16, 16, 24);
        }
 
+       // disable until we get textures for it
+       R_ResetSkyBox();
+
+       ent = &cl.entities[0];
+       // entire entity array was cleared, so just fill in a few fields
+       ent->state_current.active = true;
+       ent->render.model = cl.worldmodel = NULL; // no world model yet
+       ent->render.scale = 1; // some of the renderer still relies on scale
+       ent->render.alpha = 1;
+       ent->render.colormap = -1; // no special coloring
+       ent->render.flags = RENDER_SHADOW | RENDER_LIGHT;
+       Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1);
+       Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
+       CL_BoundingBoxForEntity(&ent->render);
+
+       // noclip is turned off at start
+       noclip_anglehack = false;
+
+       // mark all frames invalid for delta
+       memset(cl.qw_deltasequence, -1, sizeof(cl.qw_deltasequence));
+
        CL_Screen_NewMap();
-       CL_Particles_Clear();
-       CL_CGVM_Clear();
 }
 
 void CL_ExpandEntities(int num)
 {
        int i, oldmaxentities;
        entity_t *oldentities;
-       if (num >= cl_max_entities)
+       if (num >= cl.max_entities)
        {
-               if (!cl_entities)
-                       Sys_Error("CL_ExpandEntities: cl_entities not initialized");
+               if (!cl.entities)
+                       Sys_Error("CL_ExpandEntities: cl.entities not initialized");
                if (num >= MAX_EDICTS)
                        Host_Error("CL_ExpandEntities: num %i >= %i", num, MAX_EDICTS);
-               oldmaxentities = cl_max_entities;
-               oldentities = cl_entities;
-               cl_max_entities = (num & ~255) + 256;
-               cl_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t));
-               memcpy(cl_entities, oldentities, oldmaxentities * sizeof(entity_t));
+               oldmaxentities = cl.max_entities;
+               oldentities = cl.entities;
+               cl.max_entities = (num & ~255) + 256;
+               cl.entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_entities * sizeof(entity_t));
+               memcpy(cl.entities, oldentities, oldmaxentities * sizeof(entity_t));
                Mem_Free(oldentities);
-               for (i = oldmaxentities;i < cl_max_entities;i++)
+               for (i = oldmaxentities;i < cl.max_entities;i++)
                {
-                       cl_entities[i].state_baseline = defaultstate;
-                       cl_entities[i].state_previous = defaultstate;
-                       cl_entities[i].state_current = defaultstate;
+                       cl.entities[i].state_baseline = defaultstate;
+                       cl.entities[i].state_previous = defaultstate;
+                       cl.entities[i].state_current = defaultstate;
                }
        }
 }
@@ -247,25 +227,25 @@ void CL_ExpandCSQCEntities(int num)
 {
        int i, oldmaxentities;
        entity_t *oldentities;
-       if (num >= cl_max_csqcentities)
+       if (num >= cl.max_csqcentities)
        {
-               if (!cl_csqcentities)
-                       Sys_Error("CL_ExpandCSQCEntities: cl_csqcentities not initialized\n");
+               if (!cl.csqcentities)
+                       Sys_Error("CL_ExpandCSQCEntities: cl.csqcentities not initialized\n");
                if (num >= MAX_EDICTS)
                        Host_Error("CL_ExpandCSQCEntities: num %i >= %i\n", num, MAX_EDICTS);
-               oldmaxentities = cl_max_csqcentities;
-               oldentities = cl_csqcentities;
-               cl_max_csqcentities = (num & ~255) + 256;
-               cl_csqcentities = Mem_Alloc(cl_mempool, cl_max_csqcentities * sizeof(entity_t));
-               memcpy(cl_csqcentities, oldentities, oldmaxentities * sizeof(entity_t));
+               oldmaxentities = cl.max_csqcentities;
+               oldentities = cl.csqcentities;
+               cl.max_csqcentities = (num & ~255) + 256;
+               cl.csqcentities = Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t));
+               memcpy(cl.csqcentities, oldentities, oldmaxentities * sizeof(entity_t));
                Mem_Free(oldentities);
-               for (i = oldmaxentities;i < cl_max_csqcentities;i++)
+               for (i = oldmaxentities;i < cl.max_csqcentities;i++)
                {
-                       cl_csqcentities[i].state_baseline = defaultstate;
-                       cl_csqcentities[i].state_previous = defaultstate;
-                       cl_csqcentities[i].state_current = defaultstate;
-                       cl_csqcentities[i].csqc = true;
-                       cl_csqcentities[i].state_current.number = -i;
+                       cl.csqcentities[i].state_baseline = defaultstate;
+                       cl.csqcentities[i].state_previous = defaultstate;
+                       cl.csqcentities[i].state_current = defaultstate;
+                       cl.csqcentities[i].csqc = true;
+                       cl.csqcentities[i].state_current.number = -i;
                }
        }
 }
@@ -302,14 +282,30 @@ void CL_Disconnect(void)
                CL_StopPlayback();
        else if (cls.netcon)
        {
+               sizebuf_t buf;
+               unsigned char bufdata[8];
                if (cls.demorecording)
                        CL_Stop_f();
 
-               Con_DPrint("Sending clc_disconnect\n");
-               SZ_Clear(&cls.message);
-               MSG_WriteByte(&cls.message, clc_disconnect);
-               NetConn_SendUnreliableMessage(cls.netcon, &cls.message);
-               SZ_Clear(&cls.message);
+               // send disconnect message 3 times to improve chances of server
+               // receiving it (but it still fails sometimes)
+               memset(&buf, 0, sizeof(buf));
+               buf.data = bufdata;
+               buf.maxsize = sizeof(bufdata);
+               if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               {
+                       Con_DPrint("Sending drop command\n");
+                       MSG_WriteByte(&buf, qw_clc_stringcmd);
+                       MSG_WriteString(&buf, "drop");
+               }
+               else
+               {
+                       Con_DPrint("Sending clc_disconnect\n");
+                       MSG_WriteByte(&buf, clc_disconnect);
+               }
+               NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
+               NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
+               NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
                NetConn_Close(cls.netcon);
                cls.netcon = NULL;
        }
@@ -323,7 +319,7 @@ void CL_Disconnect_f(void)
 {
        CL_Disconnect ();
        if (sv.active)
-               Host_ShutdownServer (false);
+               Host_ShutdownServer ();
 }
 
 
@@ -348,6 +344,9 @@ void CL_EstablishConnection(const char *host)
        // stop demo loop in case this fails
        CL_Disconnect();
 
+       // make sure the client ports are open before attempting to connect
+       NetConn_UpdateSockets();
+
        // run a network frame
        //NetConn_ClientFrame();SV_VM_Begin();NetConn_ServerFrame();SV_VM_End();
 
@@ -384,7 +383,7 @@ static void CL_PrintEntities_f(void)
        int i, j;
        char name[32];
 
-       for (i = 0, ent = cl_entities;i < cl_num_entities;i++, ent++)
+       for (i = 0, ent = cl.entities;i < cl.num_entities;i++, ent++)
        {
                if (!ent->state_current.active)
                        continue;
@@ -488,7 +487,7 @@ static float CL_LerpPoint(void)
 
 void CL_ClearTempEntities (void)
 {
-       cl_num_temp_entities = 0;
+       cl.num_temp_entities = 0;
 }
 
 entity_t *CL_NewTempEntity(void)
@@ -497,9 +496,9 @@ entity_t *CL_NewTempEntity(void)
 
        if (r_refdef.numentities >= r_refdef.maxentities)
                return NULL;
-       if (cl_num_temp_entities >= cl_max_temp_entities)
+       if (cl.num_temp_entities >= cl.max_temp_entities)
                return NULL;
-       ent = &cl_temp_entities[cl_num_temp_entities++];
+       ent = &cl.temp_entities[cl.num_temp_entities++];
        memset (ent, 0, sizeof(*ent));
        r_refdef.entities[r_refdef.numentities++] = &ent->render;
 
@@ -516,7 +515,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float
        cl_effect_t *e;
        if (!modelindex) // sanity check
                return;
-       for (i = 0, e = cl_effects;i < cl_max_effects;i++, e++)
+       for (i = 0, e = cl.effects;i < cl.max_effects;i++, e++)
        {
                if (e->active)
                        continue;
@@ -531,6 +530,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float
                e->frame = 0;
                e->frame1time = cl.time;
                e->frame2time = cl.time;
+               cl.num_effects = max(cl.num_effects, i + 1);
                break;
        }
 }
@@ -544,22 +544,22 @@ void CL_AllocDlight(entity_render_t *ent, matrix4x4_t *matrix, float radius, flo
 // first look for an exact key match
        if (ent)
        {
-               dl = cl_dlights;
-               for (i = 0;i < cl_activedlights;i++, dl++)
+               dl = cl.dlights;
+               for (i = 0;i < cl.num_dlights;i++, dl++)
                        if (dl->ent == ent)
                                goto dlightsetup;
        }
        */
 
 // then look for anything else
-       dl = cl_dlights;
-       for (i = 0;i < cl_activedlights;i++, dl++)
+       dl = cl.dlights;
+       for (i = 0;i < cl.num_dlights;i++, dl++)
                if (!dl->radius)
                        goto dlightsetup;
        // if we hit the end of the active dlights and found no gaps, add a new one
        if (i < MAX_DLIGHTS)
        {
-               cl_activedlights = i + 1;
+               cl.num_dlights = i + 1;
                goto dlightsetup;
        }
 
@@ -606,9 +606,9 @@ void CL_DecayLights(void)
        float time, f;
 
        time = cl.time - cl.oldtime;
-       oldmax = cl_activedlights;
-       cl_activedlights = 0;
-       for (i = 0, dl = cl_dlights;i < oldmax;i++, dl++)
+       oldmax = cl.num_dlights;
+       cl.num_dlights = 0;
+       for (i = 0, dl = cl.dlights;i < oldmax;i++, dl++)
        {
                if (dl->radius)
                {
@@ -616,7 +616,7 @@ void CL_DecayLights(void)
                        if (cl.time < dl->die && f > 0)
                        {
                                dl->radius = dl->radius - time * dl->decay;
-                               cl_activedlights = i + 1;
+                               cl.num_dlights = i + 1;
                        }
                        else
                                dl->radius = 0;
@@ -634,7 +634,7 @@ void CL_UpdateLights(void)
        r_refdef.numlights = 0;
        if (r_dynamic.integer)
        {
-               for (i = 0, dl = cl_dlights;i < cl_activedlights;i++, dl++)
+               for (i = 0, dl = cl.dlights;i < cl.num_dlights;i++, dl++)
                {
                        if (dl->radius)
                        {
@@ -649,21 +649,76 @@ void CL_UpdateLights(void)
        f = cl.time * 10;
        i = (int)floor(f);
        frac = f - i;
-       for (j = 0;j < MAX_LIGHTSTYLES;j++)
+       for (j = 0;j < cl.max_lightstyle;j++)
        {
-               if (!cl_lightstyle || !cl_lightstyle[j].length)
+               if (!cl.lightstyle || !cl.lightstyle[j].length)
                {
                        r_refdef.lightstylevalue[j] = 256;
                        continue;
                }
-               k = i % cl_lightstyle[j].length;
-               l = (i-1) % cl_lightstyle[j].length;
-               k = cl_lightstyle[j].map[k] - 'a';
-               l = cl_lightstyle[j].map[l] - 'a';
+               k = i % cl.lightstyle[j].length;
+               l = (i-1) % cl.lightstyle[j].length;
+               k = cl.lightstyle[j].map[k] - 'a';
+               l = cl.lightstyle[j].map[l] - 'a';
                r_refdef.lightstylevalue[j] = ((k*frac)+(l*(1-frac)))*22;
        }
 }
 
+void CL_AddQWCTFFlagModel(entity_t *player, int skin)
+{
+       float f;
+       entity_t *flag;
+       matrix4x4_t flagmatrix;
+
+       // this code taken from QuakeWorld
+       f = 14;
+       if (player->render.frame2 >= 29 && player->render.frame2 <= 40)
+       {
+               if (player->render.frame2 >= 29 && player->render.frame2 <= 34)
+               { //axpain
+                       if      (player->render.frame2 == 29) f = f + 2;
+                       else if (player->render.frame2 == 30) f = f + 8;
+                       else if (player->render.frame2 == 31) f = f + 12;
+                       else if (player->render.frame2 == 32) f = f + 11;
+                       else if (player->render.frame2 == 33) f = f + 10;
+                       else if (player->render.frame2 == 34) f = f + 4;
+               }
+               else if (player->render.frame2 >= 35 && player->render.frame2 <= 40)
+               { // pain
+                       if      (player->render.frame2 == 35) f = f + 2;
+                       else if (player->render.frame2 == 36) f = f + 10;
+                       else if (player->render.frame2 == 37) f = f + 10;
+                       else if (player->render.frame2 == 38) f = f + 8;
+                       else if (player->render.frame2 == 39) f = f + 4;
+                       else if (player->render.frame2 == 40) f = f + 2;
+               }
+       }
+       else if (player->render.frame2 >= 103 && player->render.frame2 <= 118)
+       {
+               if      (player->render.frame2 >= 103 && player->render.frame2 <= 104) f = f + 6;  //nailattack
+               else if (player->render.frame2 >= 105 && player->render.frame2 <= 106) f = f + 6;  //light
+               else if (player->render.frame2 >= 107 && player->render.frame2 <= 112) f = f + 7;  //rocketattack
+               else if (player->render.frame2 >= 112 && player->render.frame2 <= 118) f = f + 7;  //shotattack
+       }
+       // end of code taken from QuakeWorld
+
+       flag = CL_NewTempEntity();
+       if (!flag)
+               return;
+
+       flag->render.model = cl.model_precache[cl.qw_modelindex_flag];
+       flag->render.skinnum = skin;
+       flag->render.colormap = -1; // no special coloring
+       flag->render.alpha = 1;
+       VectorSet(flag->render.colormod, 1, 1, 1);
+       // attach the flag to the player matrix
+       Matrix4x4_CreateFromQuakeEntity(&flagmatrix, -f, -22, 0, 0, 0, -45, 1);
+       Matrix4x4_Concat(&flag->render.matrix, &player->render.matrix, &flagmatrix);
+       Matrix4x4_Invert_Simple(&flag->render.inversematrix, &flag->render.matrix);
+       R_LerpAnimation(&flag->render);
+       CL_BoundingBoxForEntity(&flag->render);
+}
+
 #define MAXVIEWMODELS 32
 entity_t *viewmodels[MAXVIEWMODELS];
 int numviewmodels;
@@ -695,7 +750,7 @@ void CL_LinkNetworkEntity(entity_t *e)
        {
                e->persistent.linkframe = entitylinkframenumber;
                // skip inactive entities and world
-               if (!e->state_current.active || e == cl_entities || e == cl_csqcentities)
+               if (!e->state_current.active || e == cl.entities || e == cl.csqcentities)
                        return;
                e->render.alpha = e->state_current.alpha * (1.0f / 255.0f); // FIXME: interpolate?
                e->render.scale = e->state_current.scale * (1.0f / 16.0f); // FIXME: interpolate?
@@ -709,14 +764,14 @@ void CL_LinkNetworkEntity(entity_t *e)
                        e->render.colormap = e->state_current.colormap;
                        cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12;
                        cbcolor = (unsigned char *) (&palette_complete[cb]);
-                       e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
-                       e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
-                       e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+                       e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f);
+                       e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f);
+                       e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f);
                        cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12;
                        cbcolor = (unsigned char *) (&palette_complete[cb]);
-                       e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
-                       e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
-                       e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+                       e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f);
+                       e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f);
+                       e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f);
                }
                else if (e->state_current.colormap && cl.scores != NULL)
                {
@@ -725,14 +780,14 @@ void CL_LinkNetworkEntity(entity_t *e)
                        e->render.colormap = cl.scores[e->state_current.colormap - 1].colors; // color it
                        cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12;
                        cbcolor = (unsigned char *) (&palette_complete[cb]);
-                       e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
-                       e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
-                       e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+                       e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f);
+                       e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f);
+                       e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f);
                        cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12;
                        cbcolor = (unsigned char *) (&palette_complete[cb]);
-                       e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
-                       e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
-                       e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+                       e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f);
+                       e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f);
+                       e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f);
                }
                else
                {
@@ -748,11 +803,11 @@ void CL_LinkNetworkEntity(entity_t *e)
                        if (!e->csqc)
                        {
                                if (cl.viewentity)
-                                       CL_LinkNetworkEntity(cl_entities + cl.viewentity);
-                               if (e == &cl.viewent && cl_entities[cl.viewentity].state_current.active)
+                                       CL_LinkNetworkEntity(cl.entities + cl.viewentity);
+                               if (e == &cl.viewent && cl.entities[cl.viewentity].state_current.active)
                                {
-                                       e->state_current.alpha = cl_entities[cl.viewentity].state_current.alpha;
-                                       e->state_current.effects = EF_NOSHADOW | (cl_entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_REFLECTIVE | EF_FULLBRIGHT | EF_NODEPTHTEST));
+                                       e->state_current.alpha = cl.entities[cl.viewentity].state_current.alpha;
+                                       e->state_current.effects = EF_NOSHADOW | (cl.entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_REFLECTIVE | EF_FULLBRIGHT | EF_NODEPTHTEST));
                                }
                        }
                        matrix = &viewmodelmatrix;
@@ -762,15 +817,15 @@ void CL_LinkNetworkEntity(entity_t *e)
                        // if the tag entity is currently impossible, skip it
                        if (!e->csqc)
                        {
-                               if (e->state_current.tagentity >= cl_num_entities)
+                               if (e->state_current.tagentity >= cl.num_entities)
                                        return;
-                               t = cl_entities + e->state_current.tagentity;
+                               t = cl.entities + e->state_current.tagentity;
                        }
                        else
                        {
-                               if (e->state_current.tagentity >= cl_num_csqcentities)
+                               if (e->state_current.tagentity >= cl.num_csqcentities)
                                        return;
-                               t = cl_csqcentities + e->state_current.tagentity;
+                               t = cl.csqcentities + e->state_current.tagentity;
                        }
                        // if the tag entity is inactive, skip it
                        if (!t->state_current.active)
@@ -805,7 +860,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 
                // movement lerp
                // if it's the player entity, update according to client movement
-               if (e == cl_entities + cl.playerentity && cl.movement)// && !e->csqc)
+               if (e == cl.entities + cl.playerentity && cl.movement)// && !e->csqc)
                {
                        lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]);
                        lerp = bound(0, lerp, 1);
@@ -984,6 +1039,11 @@ void CL_LinkNetworkEntity(entity_t *e)
                                dlightcolor[1] += 0.7f;
                                dlightcolor[2] += 0.3f;
                        }
+                       if (e->render.effects & (EF_FLAG1QW | EF_FLAG2QW))
+                       {
+                               // these are only set on player entities
+                               CL_AddQWCTFFlagModel(e, (e->render.effects & EF_FLAG2QW) != 0);
+                       }
                }
                // muzzleflash fades over time, and is offset a bit
                if (e->persistent.muzzleflash > 0)
@@ -1108,14 +1168,14 @@ void CL_LinkNetworkEntity(entity_t *e)
                // hide player shadow during intermission or nehahra movie
                if (!(e->render.effects & EF_NOSHADOW)
                 && !(e->render.flags & (RENDER_VIEWMODEL | RENDER_TRANSPARENT))
-                && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cl.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
+                && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
                        e->render.flags |= RENDER_SHADOW;
                // as soon as player is known we can call V_CalcRefDef
                if (!csqc_loaded)
                if (e->state_current.number == cl.viewentity)
                        V_CalcRefdef();
                if (e->render.model && e->render.model->name[0] == '*' && e->render.model->TraceBox)
-                       cl_brushmodel_entities[cl_num_brushmodel_entities++] = e->state_current.number;
+                       cl.brushmodel_entities[cl.num_brushmodel_entities++] = e->state_current.number;
                // don't show entities with no modelindex (note: this still shows
                // entities which have a modelindex that resolved to a NULL model)
                if (e->render.model && !(e->render.effects & EF_NODRAW) && r_refdef.numentities < r_refdef.maxentities)
@@ -1127,11 +1187,11 @@ void CL_LinkNetworkEntity(entity_t *e)
 
 void CL_RelinkWorld(void)
 {
-       entity_t *ent = &cl_entities[0];
-       cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0;
+       entity_t *ent = &cl.entities[0];
+       cl.brushmodel_entities[cl.num_brushmodel_entities++] = 0;
        // FIXME: this should be done at load
-       Matrix4x4_CreateIdentity(&ent->render.matrix);
-       Matrix4x4_CreateIdentity(&ent->render.inversematrix);
+       ent->render.matrix = identitymatrix;
+       ent->render.inversematrix = identitymatrix;
        R_LerpAnimation(&ent->render);
        CL_BoundingBoxForEntity(&ent->render);
        ent->render.flags = RENDER_SHADOW;
@@ -1144,13 +1204,13 @@ void CL_RelinkWorld(void)
 
 void CL_RelinkCSQCWorld(void)  //[515]: csqc
 {
-       entity_t *ent = &cl_csqcentities[0];
+       entity_t *ent = &cl.csqcentities[0];
        if(!csqc_loaded)
                return;
-//     cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0;
+//     cl.brushmodel_entities[cl.num_brushmodel_entities++] = 0;
        // FIXME: this should be done at load
-       Matrix4x4_CreateIdentity(&ent->render.matrix);
-       Matrix4x4_CreateIdentity(&ent->render.inversematrix);
+       ent->render.matrix = identitymatrix;
+       ent->render.inversematrix = identitymatrix;
        R_LerpAnimation(&ent->render);
        CL_BoundingBoxForEntity(&ent->render);
        ent->render.flags = RENDER_SHADOW;
@@ -1165,7 +1225,7 @@ static void CL_RelinkStaticEntities(void)
 {
        int i;
        entity_t *e;
-       for (i = 0, e = cl_static_entities;i < cl_num_static_entities && r_refdef.numentities < r_refdef.maxentities;i++, e++)
+       for (i = 0, e = cl.static_entities;i < cl.num_static_entities && r_refdef.numentities < r_refdef.maxentities;i++, e++)
        {
                e->render.flags = 0;
                // transparent stuff can't be lit during the opaque stage
@@ -1227,21 +1287,21 @@ static void CL_RelinkNetworkEntities(int drawmask)
        entitylinkframenumber++;
        if(drawmask & ENTMASK_ENGINE || !csqc_loaded)
        {
-               for (i = 1;i < cl_num_entities;i++)
+               for (i = 1;i < cl.num_entities;i++)
                {
-                       if (cl_entities_active[i])
+                       if (cl.entities_active[i])
                        {
-                               ent = cl_entities + i;
+                               ent = cl.entities + i;
                                if (!(drawmask & ENTMASK_ENGINEVIEWMODELS))
                                if (ent->state_current.flags & RENDER_VIEWMODEL)        //[515]: csqc drawmask
                                {
-                                       cl_entities_active[i] = false;
+                                       cl.entities_active[i] = false;
                                        continue;
                                }
                                if (ent->state_current.active)
                                        CL_LinkNetworkEntity(ent);
                                else
-                                       cl_entities_active[i] = false;
+                                       cl.entities_active[i] = false;
                        }
                }
        }
@@ -1249,16 +1309,16 @@ static void CL_RelinkNetworkEntities(int drawmask)
        //[515]: csqc
        if(csqc_loaded)
        {
-               for (i=1,k=cl_num_csqcentities;k;i++)
+               for (i=1,k=cl.num_csqcentities;k;i++)
                {
-                       if (cl_csqcentities_active[i])
+                       if (cl.csqcentities_active[i])
                        {
                                --k;
-                               ent = cl_csqcentities + i;
+                               ent = cl.csqcentities + i;
                                if (ent->state_current.active)
                                        CL_LinkNetworkEntity(ent);
                                else
-                                       cl_csqcentities_active[i] = false;
+                                       cl.csqcentities_active[i] = false;
                        }
                }
        }
@@ -1273,7 +1333,7 @@ static void CL_RelinkEffects(void)
        entity_t *ent;
        float frame;
 
-       for (i = 0, e = cl_effects;i < cl_max_effects;i++, e++)
+       for (i = 0, e = cl.effects;i < cl.num_effects;i++, e++)
        {
                if (e->active)
                {
@@ -1282,6 +1342,8 @@ static void CL_RelinkEffects(void)
                        if (intframe < 0 || intframe >= e->endframe)
                        {
                                memset(e, 0, sizeof(*e));
+                               while (cl.num_effects > 0 && !cl.effects[cl.num_effects - 1].active)
+                                       cl.num_effects--;
                                continue;
                        }
 
@@ -1335,17 +1397,22 @@ void CL_RelinkBeams(void)
        float forward;
        matrix4x4_t tempmatrix;
 
-       for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+       for (i = 0, b = cl.beams;i < cl.num_beams;i++, b++)
        {
-               if (!b->model || b->endtime < cl.time)
+               if (!b->model)
+                       continue;
+               if (b->endtime < cl.time)
+               {
+                       b->model = NULL;
                        continue;
+               }
 
                // if coming from the player, update the start position
                //if (b->entity == cl.viewentity)
-               //      Matrix4x4_OriginFromMatrix(&cl_entities[cl.viewentity].render.matrix, b->start);
-               if (cl_beams_relative.integer && b->entity && cl_entities[b->entity].state_current.active && b->relativestartvalid)
+               //      Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, b->start);
+               if (cl_beams_relative.integer && b->entity && cl.entities[b->entity].state_current.active && b->relativestartvalid)
                {
-                       entity_render_t *r = &cl_entities[b->entity].render;
+                       entity_render_t *r = &cl.entities[b->entity].render;
                        //Matrix4x4_OriginFromMatrix(&r->matrix, origin);
                        //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(&r->matrix, b->relativestart, b->start);
@@ -1409,6 +1476,37 @@ void CL_RelinkBeams(void)
                        d -= 30;
                }
        }
+
+       while (cl.num_beams > 0 && !cl.beams[cl.num_beams - 1].model)
+               cl.num_beams--;
+}
+
+static void CL_RelinkQWNails(void)
+{
+       int i;
+       vec_t *v;
+       entity_t *ent;
+
+       for (i = 0;i < cl.qw_num_nails;i++)
+       {
+               v = cl.qw_nails[i];
+
+               // if we're drawing effects, get a new temp entity
+               // (NewTempEntity adds it to the render entities list for us)
+               if (!(ent = CL_NewTempEntity()))
+                       continue;
+
+               // normal stuff
+               ent->render.model = cl.model_precache[cl.qw_modelindex_spike];
+               ent->render.colormap = -1; // no special coloring
+               ent->render.alpha = 1;
+               VectorSet(ent->render.colormod, 1, 1, 1);
+
+               Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, v[0], v[1], v[2], v[3], v[4], v[5], 1);
+               Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
+               R_LerpAnimation(&ent->render);
+               CL_BoundingBoxForEntity(&ent->render);
+       }
 }
 
 void CL_LerpPlayer(float frac)
@@ -1457,6 +1555,7 @@ void CSQC_RelinkAllEntities (int drawmask)
                CL_RelinkStaticEntities();
                CL_RelinkBeams();
                CL_RelinkEffects();
+               CL_RelinkQWNails();
        }
 }
 
@@ -1472,12 +1571,13 @@ extern void CL_ClientMovement_Replay();
 int CL_ReadFromServer(void)
 {
        CL_ReadDemoMessage();
+       CL_SendMove();
 
        r_refdef.time = cl.time;
        r_refdef.extraupdate = !r_speeds.integer;
        r_refdef.numentities = 0;
-       Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
-       cl_num_brushmodel_entities = 0;
+       r_refdef.viewentitymatrix = identitymatrix;
+       cl.num_brushmodel_entities = 0;
 
        if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
@@ -1504,13 +1604,11 @@ int CL_ReadFromServer(void)
                        CL_RelinkStaticEntities();
                        CL_RelinkBeams();
                        CL_RelinkEffects();
+                       CL_RelinkQWNails();
                }
                else
                        csqc_frame = true;
 
-               // run cgame code (which can add more entities)
-               CL_CGVM_Frame();
-
                CL_UpdateLights();
 
                // update view blend
@@ -1520,34 +1618,6 @@ int CL_ReadFromServer(void)
        return 0;
 }
 
-/*
-=================
-CL_SendCmd
-=================
-*/
-void CL_UpdatePrydonCursor(void);
-void CL_SendCmd(void)
-{
-       if (cls.demoplayback)
-       {
-               SZ_Clear(&cls.message);
-               return;
-       }
-
-       // send the reliable message (forwarded commands) if there is one
-       if (cls.message.cursize && NetConn_CanSendMessage(cls.netcon))
-       {
-               if (developer.integer)
-               {
-                       Con_Print("CL_SendCmd: sending reliable message:\n");
-                       SZ_HexDumpToConsole(&cls.message);
-               }
-               if (NetConn_SendReliableMessage(cls.netcon, &cls.message) == -1)
-                       Host_Error("CL_WriteToServer: lost server connection");
-               SZ_Clear(&cls.message);
-       }
-}
-
 // LordHavoc: pausedemo command
 static void CL_PauseDemo_f (void)
 {
@@ -1611,11 +1681,11 @@ CL_Shutdown
 */
 void CL_Shutdown (void)
 {
-       CL_CGVM_Shutdown();
        CL_Particles_Shutdown();
        CL_Parse_Shutdown();
 
-       Mem_FreePool (&cl_mempool);
+       Mem_FreePool (&cls.permanentmempool);
+       Mem_FreePool (&cls.levelmempool);
 }
 
 /*
@@ -1625,20 +1695,13 @@ CL_Init
 */
 void CL_Init (void)
 {
-       cl_mempool = Mem_AllocPool("client", 0, NULL);
+       cls.levelmempool = Mem_AllocPool("client (per-level memory)", 0, NULL);
+       cls.permanentmempool = Mem_AllocPool("client (long term memory)", 0, NULL);
 
        memset(&r_refdef, 0, sizeof(r_refdef));
        // max entities sent to renderer per frame
        r_refdef.maxentities = MAX_EDICTS + 256 + 512;
-       r_refdef.entities = (entity_render_t **)Mem_Alloc(cl_mempool, sizeof(entity_render_t *) * r_refdef.maxentities);
-       // 256k drawqueue buffer
-       // TODO: make dynamic
-       r_refdef.maxdrawqueuesize = 256 * 1024;
-       r_refdef.drawqueue = (unsigned char *)Mem_Alloc(cl_mempool, r_refdef.maxdrawqueuesize);
-
-       cls.message.data = cls.message_buf;
-       cls.message.maxsize = sizeof(cls.message_buf);
-       cls.message.cursize = 0;
+       r_refdef.entities = (entity_render_t **)Mem_Alloc(cls.permanentmempool, sizeof(entity_render_t *) * r_refdef.maxentities);
 
        CL_InitInput ();
 
@@ -1671,17 +1734,17 @@ void CL_Init (void)
        Cvar_RegisterVariable (&cl_itembobspeed);
        Cvar_RegisterVariable (&cl_itembobheight);
 
-       Cmd_AddCommand ("entities", CL_PrintEntities_f);
-       Cmd_AddCommand ("disconnect", CL_Disconnect_f);
-       Cmd_AddCommand ("record", CL_Record_f);
-       Cmd_AddCommand ("stop", CL_Stop_f);
-       Cmd_AddCommand ("playdemo", CL_PlayDemo_f);
-       Cmd_AddCommand ("timedemo", CL_TimeDemo_f);
+       Cmd_AddCommand ("entities", CL_PrintEntities_f, "print information on network entities known to client");
+       Cmd_AddCommand ("disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
+       Cmd_AddCommand ("record", CL_Record_f, "record a demo");
+       Cmd_AddCommand ("stop", CL_Stop_f, "stop recording or playing a demo");
+       Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "watch a demo file");
+       Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log");
 
-       Cmd_AddCommand ("fog", CL_Fog_f);
+       Cmd_AddCommand ("fog", CL_Fog_f, "set global fog parameters (density red green blue)");
 
        // LordHavoc: added pausedemo
-       Cmd_AddCommand ("pausedemo", CL_PauseDemo_f);
+       Cmd_AddCommand ("pausedemo", CL_PauseDemo_f, "pause demo playback (can also safely pause demo recording if using QUAKE, QUAKEDP or NEHAHRAMOVIE protocol, useful for making movies)");
 
        Cvar_RegisterVariable(&r_draweffects);
        Cvar_RegisterVariable(&cl_explosions_alpha_start);
@@ -1700,12 +1763,15 @@ void CL_Init (void)
 
        Cvar_RegisterVariable(&cl_deathnoviewmodel);
 
-       Cmd_AddCommand("timerefresh", CL_TimeRefresh_f);
+       // for QW connections
+       Cvar_RegisterVariable(&qport);
+       Cvar_SetValueQuick(&qport, (rand() * RAND_MAX + rand()) & 0xffff);
+
+       Cmd_AddCommand("timerefresh", CL_TimeRefresh_f, "turn quickly and print rendering statistcs");
 
        CL_Parse_Init();
        CL_Particles_Init();
        CL_Screen_Init();
-       CL_CGVM_Init();
 
        CL_Video_Init();
 }