]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_main.c
Fix a potential memory leak with wavefront sounds
[xonotic/darkplaces.git] / cl_main.c
index 8357ebb1d939bfcea0def97d3da0a319499f9b74..7dc196eb47cdbc9abb275235197f82b3d7ed9233 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -209,6 +209,9 @@ void CL_ClearState(void)
        CL_Screen_NewMap();
 }
 
+extern cvar_t cl_topcolor;
+extern cvar_t cl_bottomcolor;
+
 void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allowstarkey, qboolean allowmodel, qboolean quiet)
 {
        int i;
@@ -255,11 +258,13 @@ void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allo
                }
                else if (!strcasecmp(key, "topcolor"))
                {
-                       // don't send anything, the combined color code will be updated manually
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va(vabuf, sizeof(vabuf), "color %i %i", atoi(value), cl_bottomcolor.integer));
                }
                else if (!strcasecmp(key, "bottomcolor"))
                {
-                       // don't send anything, the combined color code will be updated manually
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va(vabuf, sizeof(vabuf), "color %i %i", cl_topcolor.integer, atoi(value)));
                }
                else if (!strcasecmp(key, "rate"))
                {
@@ -323,6 +328,8 @@ void CL_ExpandCSQCRenderEntities(int num)
        }
 }
 
+extern cvar_t rcon_secure;
+
 /*
 =====================
 CL_Disconnect
@@ -396,18 +403,94 @@ void CL_Disconnect(void)
        cls.state = ca_disconnected;
        cl.islocalgame = false;
 
-       cls.demoplayback = cls.timedemo = false;
+       cls.demoplayback = cls.timedemo = host.restless = false;
        cls.signon = 0;
 
        // If we're dropped mid-connection attempt, it won't clear otherwise.
        SCR_ClearLoadingScreen(false);
 }
 
+/*
+==================
+CL_Reconnect_f
+
+This command causes the client to wait for the signon messages again.
+This is sent just before a server changes levels
+==================
+*/
+void CL_Reconnect_f(cmd_state_t *cmd)
+{
+       char temp[128];
+       // if not connected, reconnect to the most recent server
+       if (!cls.netcon)
+       {
+               // if we have connected to a server recently, the userinfo
+               // will still contain its IP address, so get the address...
+               InfoString_GetValue(cls.userinfo, "*ip", temp, sizeof(temp));
+               if (temp[0])
+                       CL_EstablishConnection(temp, -1);
+               else
+                       Con_Printf("Reconnect to what server?  (you have not connected to a server yet)\n");
+               return;
+       }
+       // if connected, do something based on protocol
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+       {
+               // quakeworld can just re-login
+               if (cls.qw_downloadmemory)  // don't change when downloading
+                       return;
+
+               S_StopAllSounds();
+
+               if (cls.state == ca_connected)
+               {
+                       Con_Printf("Server is changing level...\n");
+                       MSG_WriteChar(&cls.netcon->message, qw_clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, "new");
+               }
+       }
+       else
+       {
+               // netquake uses reconnect on level changes (silly)
+               if (Cmd_Argc(cmd) != 1)
+               {
+                       Con_Print("reconnect : wait for signon messages again\n");
+                       return;
+               }
+               if (!cls.signon)
+               {
+                       Con_Print("reconnect: no signon, ignoring reconnect\n");
+                       return;
+               }
+               cls.signon = 0;         // need new connection messages
+       }
+}
+
+/*
+=====================
+CL_Connect_f
+
+User command to connect to server
+=====================
+*/
+static void CL_Connect_f(cmd_state_t *cmd)
+{
+       if (Cmd_Argc(cmd) < 2)
+       {
+               Con_Print("connect <serveraddress> [<key> <value> ...]: connect to a multiplayer game\n");
+               return;
+       }
+       // clear the rcon password, to prevent vulnerability by stuffcmd-ing a connect command
+       if(rcon_secure.integer <= 0)
+               Cvar_SetQuick(&rcon_password, "");
+       CL_EstablishConnection(Cmd_Argv(cmd, 1), 2);
+}
+
 void CL_Disconnect_f(cmd_state_t *cmd)
 {
        CL_Disconnect ();
        if (sv.active)
-               Host_ShutdownServer ();
+               SV_Shutdown ();
 }
 
 
@@ -420,7 +503,7 @@ CL_EstablishConnection
 Host should be either "local" or a net address
 =====================
 */
-void CL_EstablishConnection(const char *host, int firstarg)
+void CL_EstablishConnection(const char *address, int firstarg)
 {
        if (cls.state == ca_dedicated)
                return;
@@ -440,7 +523,7 @@ void CL_EstablishConnection(const char *host, int firstarg)
        // make sure the client ports are open before attempting to connect
        NetConn_UpdateSockets();
 
-       if (LHNETADDRESS_FromString(&cls.connect_address, host, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address)))
+       if (LHNETADDRESS_FromString(&cls.connect_address, address, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address)))
        {
                cls.connect_trying = true;
                cls.connect_remainingtries = 3;
@@ -666,11 +749,11 @@ entity_render_t *CL_NewTempEntity(double shadertime)
        return render;
 }
 
-void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate)
+void CL_Effect(vec3_t org, dp_model_t *model, int startframe, int framecount, float framerate)
 {
        int i;
        cl_effect_t *e;
-       if (!modelindex) // sanity check
+       if (!model) // sanity check
                return;
        if (framerate < 1)
        {
@@ -688,7 +771,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float
                        continue;
                e->active = true;
                VectorCopy(org, e->origin);
-               e->modelindex = modelindex;
+               e->model = model;
                e->starttime = cl.time;
                e->startframe = startframe;
                e->endframe = startframe + framecount;
@@ -702,7 +785,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float
        }
 }
 
-void CL_AllocLightFlash(entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, int cubemapnum, int style, int shadowenable, vec_t corona, vec_t coronasizescale, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int flags)
+void CL_AllocLightFlash(entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, char *cubemapname, int style, int shadowenable, vec_t corona, vec_t coronasizescale, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int flags)
 {
        int i;
        dlight_t *dl;
@@ -739,10 +822,9 @@ void CL_AllocLightFlash(entity_render_t *ent, matrix4x4_t *matrix, float radius,
                dl->die = cl.time + lifetime;
        else
                dl->die = 0;
-       if (cubemapnum > 0)
-               dpsnprintf(dl->cubemapname, sizeof(dl->cubemapname), "cubemaps/%i", cubemapnum);
-       else
-               dl->cubemapname[0] = 0;
+       dl->cubemapname[0] = 0;
+       if (cubemapname && cubemapname[0])
+               strlcpy(dl->cubemapname, cubemapname, sizeof(dl->cubemapname));
        dl->style = style;
        dl->shadow = shadowenable;
        dl->corona = corona;
@@ -1689,7 +1771,7 @@ static void CL_RelinkEffects(void)
                                }
 
                                // normal stuff
-                               entrender->model = CL_GetModelByIndex(e->modelindex);
+                               entrender->model = e->model;
                                entrender->alpha = 1;
                                VectorSet(entrender->colormod, 1, 1, 1);
                                VectorSet(entrender->glowmod, 1, 1, 1);
@@ -1956,16 +2038,6 @@ void CL_UpdateWorld(void)
        r_refdef.scene.time = cl.time;
 }
 
-// LadyHavoc: pausedemo command
-static void CL_PauseDemo_f(cmd_state_t *cmd)
-{
-       cls.demopaused = !cls.demopaused;
-       if (cls.demopaused)
-               Con_Print("Demo paused\n");
-       else
-               Con_Print("Demo unpaused\n");
-}
-
 /*
 ======================
 CL_Fog_f
@@ -2196,7 +2268,7 @@ static void CL_Locs_Save_f(cmd_state_t *cmd)
                        if (VectorCompare(loc->mins, loc->maxs))
                                break;
                if (loc)
-                       Con_Warnf("Warning: writing loc file containing a mixture of qizmo-style points and proquake-style boxes may not work in qizmo or proquake!\n");
+                       Con_Printf(CON_WARN "Warning: writing loc file containing a mixture of qizmo-style points and proquake-style boxes may not work in qizmo or proquake!\n");
        }
        for (loc = cl.locnodes;loc;loc = loc->next)
        {
@@ -2416,7 +2488,8 @@ static void CL_MeshEntities_Init(void)
                VectorSet(ent->render.render_modellight_ambient, 1, 1, 1);
                VectorSet(ent->render.render_modellight_diffuse, 0, 0, 0);
                VectorSet(ent->render.render_modellight_specular, 0, 0, 0);
-               VectorSet(ent->render.render_modellight_lightdir, 0, 0, 1);
+               VectorSet(ent->render.render_modellight_lightdir_world, 0, 0, 1);
+               VectorSet(ent->render.render_modellight_lightdir_local, 0, 0, 1); // local doesn't matter because no diffuse/specular color
                VectorSet(ent->render.render_lightmap_ambient, 0, 0, 0);
                VectorSet(ent->render.render_lightmap_diffuse, 1, 1, 1);
                VectorSet(ent->render.render_lightmap_specular, 1, 1, 1);
@@ -2592,7 +2665,7 @@ static void CL_UpdateEntityShading_Entity(entity_render_t *ent)
                ent->render_modellight_ambient[q] = a[q] * ent->colormod[q];
                ent->render_modellight_diffuse[q] = c[q] * ent->colormod[q];
                ent->render_modellight_specular[q] = c[q];
-               ent->render_modellight_lightdir[q] = dir[q];
+               ent->render_modellight_lightdir_world[q] = dir[q];
                ent->render_lightmap_ambient[q] = ent->colormod[q] * r_refdef.scene.ambientintensity;
                ent->render_lightmap_diffuse[q] = ent->colormod[q] * r_refdef.scene.lightmapintensity;
                ent->render_lightmap_specular[q] = r_refdef.scene.lightmapintensity;
@@ -2608,9 +2681,12 @@ static void CL_UpdateEntityShading_Entity(entity_render_t *ent)
                for (q = 0; q < 3; q++)
                        ent->render_rtlight_diffuse[q] = ent->render_rtlight_specular[q] = q;
 
-       if (VectorLength2(ent->render_modellight_lightdir) == 0)
-               VectorSet(ent->render_modellight_lightdir, 0, 0, 1); // have to set SOME valid vector here
-       VectorNormalize(ent->render_modellight_lightdir);
+       if (VectorLength2(ent->render_modellight_lightdir_world) == 0)
+               VectorSet(ent->render_modellight_lightdir_world, 0, 0, 1); // have to set SOME valid vector here
+       VectorNormalize(ent->render_modellight_lightdir_world);
+       // transform into local space for the entity as well
+       Matrix4x4_Transform3x3(&ent->inversematrix, ent->render_modellight_lightdir_world, ent->render_modellight_lightdir_local);
+       VectorNormalize(ent->render_modellight_lightdir_local);
 }
 
 
@@ -2629,11 +2705,34 @@ CL_Shutdown
 */
 void CL_Shutdown (void)
 {
+       // be quiet while shutting down
+       S_StopAllSounds();
+       
+       // disconnect client from server if active
+       CL_Disconnect();
+       
+       CL_Video_Shutdown();
+
+#ifdef CONFIG_MENU
+       // Shutdown menu
+       if(MR_Shutdown)
+               MR_Shutdown();
+#endif
+
+       CDAudio_Shutdown ();
+       S_Terminate ();
+       
+       R_Modules_Shutdown();
+       VID_Shutdown();
+
        CL_Screen_Shutdown();
        CL_Particles_Shutdown();
        CL_Parse_Shutdown();
        CL_MeshEntities_Shutdown();
 
+       Key_Shutdown();
+       S_Shutdown();
+
        Mem_FreePool (&cls.permanentmempool);
        Mem_FreePool (&cls.levelmempool);
 }
@@ -2647,7 +2746,7 @@ void CL_Init (void)
 {
        if (cls.state == ca_dedicated)
        {
-               Cmd_AddCommand(&cmd_server, "disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
+               Cmd_AddCommand(CMD_SERVER, "disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
        }
        else
        {
@@ -2664,118 +2763,117 @@ void CL_Init (void)
                S_Init();
                CDAudio_Init();
                Key_Init();
-       }
 
-       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.scene.maxentities = MAX_EDICTS + 256 + 512;
-       r_refdef.scene.entities = (entity_render_t **)Mem_Alloc(cls.permanentmempool, sizeof(entity_render_t *) * r_refdef.scene.maxentities);
-
-       // max temp entities
-       r_refdef.scene.maxtempentities = MAX_TEMPENTITIES;
-       r_refdef.scene.tempentities = (entity_render_t *)Mem_Alloc(cls.permanentmempool, sizeof(entity_render_t) * r_refdef.scene.maxtempentities);
-
-       CL_InitInput ();
-
-//
-// register our commands
-//
-       Cvar_RegisterVariable (&cl_upspeed);
-       Cvar_RegisterVariable (&cl_forwardspeed);
-       Cvar_RegisterVariable (&cl_backspeed);
-       Cvar_RegisterVariable (&cl_sidespeed);
-       Cvar_RegisterVariable (&cl_movespeedkey);
-       Cvar_RegisterVariable (&cl_yawspeed);
-       Cvar_RegisterVariable (&cl_pitchspeed);
-       Cvar_RegisterVariable (&cl_anglespeedkey);
-       Cvar_RegisterVariable (&cl_shownet);
-       Cvar_RegisterVariable (&cl_nolerp);
-       Cvar_RegisterVariable (&cl_lerpexcess);
-       Cvar_RegisterVariable (&cl_lerpanim_maxdelta_server);
-       Cvar_RegisterVariable (&cl_lerpanim_maxdelta_framegroups);
-       Cvar_RegisterVariable (&cl_deathfade);
-       Cvar_RegisterVariable (&lookspring);
-       Cvar_RegisterVariable (&lookstrafe);
-       Cvar_RegisterVariable (&sensitivity);
-       Cvar_RegisterVariable (&freelook);
-
-       Cvar_RegisterVariable (&m_pitch);
-       Cvar_RegisterVariable (&m_yaw);
-       Cvar_RegisterVariable (&m_forward);
-       Cvar_RegisterVariable (&m_side);
-
-       Cvar_RegisterVariable (&cl_itembobspeed);
-       Cvar_RegisterVariable (&cl_itembobheight);
-
-       Cmd_AddCommand(&cmd_client, "entities", CL_PrintEntities_f, "print information on network entities known to client");
-       Cmd_AddCommand(&cmd_client, "disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
-       Cmd_AddCommand(&cmd_client, "record", CL_Record_f, "record a demo");
-       Cmd_AddCommand(&cmd_client, "stop", CL_Stop_f, "stop recording or playing a demo");
-       Cmd_AddCommand(&cmd_client, "playdemo", CL_PlayDemo_f, "watch a demo file");
-       Cmd_AddCommand(&cmd_client, "timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log");
-
-       // Support Client-side Model Index List
-       Cmd_AddCommand(&cmd_client, "cl_modelindexlist", CL_ModelIndexList_f, "list information on all models in the client modelindex");
-       // Support Client-side Sound Index List
-       Cmd_AddCommand(&cmd_client, "cl_soundindexlist", CL_SoundIndexList_f, "list all sounds in the client soundindex");
-
-       Cvar_RegisterVariable (&cl_autodemo);
-       Cvar_RegisterVariable (&cl_autodemo_nameformat);
-       Cvar_RegisterVariable (&cl_autodemo_delete);
-
-       Cmd_AddCommand(&cmd_client, "fog", CL_Fog_f, "set global fog parameters (density red green blue [alpha [mindist [maxdist [top [fadedepth]]]]])");
-       Cmd_AddCommand(&cmd_client, "fog_heighttexture", CL_Fog_HeightTexture_f, "set global fog parameters (density red green blue alpha mindist maxdist top depth textures/mapname/fogheight.tga)");
-
-       // LadyHavoc: added pausedemo
-       Cmd_AddCommand(&cmd_client, "pausedemo", CL_PauseDemo_f, "pause demo playback (can also safely pause demo recording if using QUAKE, QUAKEDP or NEHAHRAMOVIE protocol, useful for making movies)");
-
-       Cmd_AddCommand(&cmd_client, "cl_areastats", CL_AreaStats_f, "prints statistics on entity culling during collision traces");
-
-       Cvar_RegisterVariable(&r_draweffects);
-       Cvar_RegisterVariable(&cl_explosions_alpha_start);
-       Cvar_RegisterVariable(&cl_explosions_alpha_end);
-       Cvar_RegisterVariable(&cl_explosions_size_start);
-       Cvar_RegisterVariable(&cl_explosions_size_end);
-       Cvar_RegisterVariable(&cl_explosions_lifetime);
-       Cvar_RegisterVariable(&cl_stainmaps);
-       Cvar_RegisterVariable(&cl_stainmaps_clearonload);
-       Cvar_RegisterVariable(&cl_beams_polygons);
-       Cvar_RegisterVariable(&cl_beams_quakepositionhack);
-       Cvar_RegisterVariable(&cl_beams_instantaimhack);
-       Cvar_RegisterVariable(&cl_beams_lightatend);
-       Cvar_RegisterVariable(&cl_noplayershadow);
-       Cvar_RegisterVariable(&cl_dlights_decayradius);
-       Cvar_RegisterVariable(&cl_dlights_decaybrightness);
-
-       Cvar_RegisterVariable(&cl_prydoncursor);
-       Cvar_RegisterVariable(&cl_prydoncursor_notrace);
-
-       Cvar_RegisterVariable(&cl_deathnoviewmodel);
-
-       // for QW connections
-       Cvar_RegisterVariable(&qport);
-       Cvar_SetValueQuick(&qport, (rand() * RAND_MAX + rand()) & 0xffff);
-
-       Cmd_AddCommand(&cmd_client, "timerefresh", CL_TimeRefresh_f, "turn quickly and print rendering statistcs");
-
-       Cvar_RegisterVariable(&cl_locs_enable);
-       Cvar_RegisterVariable(&cl_locs_show);
-       Cmd_AddCommand(&cmd_client, "locs_add", CL_Locs_Add_f, "add a point or box location (usage: x y z[ x y z] \"name\", if two sets of xyz are supplied it is a box, otherwise point)");
-       Cmd_AddCommand(&cmd_client, "locs_removenearest", CL_Locs_RemoveNearest_f, "remove the nearest point or box (note: you need to be very near a box to remove it)");
-       Cmd_AddCommand(&cmd_client, "locs_clear", CL_Locs_Clear_f, "remove all loc points/boxes");
-       Cmd_AddCommand(&cmd_client, "locs_reload", CL_Locs_Reload_f, "reload .loc file for this map");
-       Cmd_AddCommand(&cmd_client, "locs_save", CL_Locs_Save_f, "save .loc file for this map containing currently defined points and boxes");
-
-       Cvar_RegisterVariable(&csqc_polygons_defaultmaterial_nocullface);
-
-       CL_Parse_Init();
-       CL_Particles_Init();
-       CL_Screen_Init();
-       CL_MeshEntities_Init();
-
-       CL_Video_Init();
-       Host_StartVideo();
+
+               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.scene.maxentities = MAX_EDICTS + 256 + 512;
+               r_refdef.scene.entities = (entity_render_t **)Mem_Alloc(cls.permanentmempool, sizeof(entity_render_t *) * r_refdef.scene.maxentities);
+
+               // max temp entities
+               r_refdef.scene.maxtempentities = MAX_TEMPENTITIES;
+               r_refdef.scene.tempentities = (entity_render_t *)Mem_Alloc(cls.permanentmempool, sizeof(entity_render_t) * r_refdef.scene.maxtempentities);
+
+               CL_InitInput ();
+
+       //
+       // register our commands
+       //
+               CL_InitCommands();
+
+               Cvar_RegisterVariable (&cl_upspeed);
+               Cvar_RegisterVariable (&cl_forwardspeed);
+               Cvar_RegisterVariable (&cl_backspeed);
+               Cvar_RegisterVariable (&cl_sidespeed);
+               Cvar_RegisterVariable (&cl_movespeedkey);
+               Cvar_RegisterVariable (&cl_yawspeed);
+               Cvar_RegisterVariable (&cl_pitchspeed);
+               Cvar_RegisterVariable (&cl_anglespeedkey);
+               Cvar_RegisterVariable (&cl_shownet);
+               Cvar_RegisterVariable (&cl_nolerp);
+               Cvar_RegisterVariable (&cl_lerpexcess);
+               Cvar_RegisterVariable (&cl_lerpanim_maxdelta_server);
+               Cvar_RegisterVariable (&cl_lerpanim_maxdelta_framegroups);
+               Cvar_RegisterVariable (&cl_deathfade);
+               Cvar_RegisterVariable (&lookspring);
+               Cvar_RegisterVariable (&lookstrafe);
+               Cvar_RegisterVariable (&sensitivity);
+               Cvar_RegisterVariable (&freelook);
+
+               Cvar_RegisterVariable (&m_pitch);
+               Cvar_RegisterVariable (&m_yaw);
+               Cvar_RegisterVariable (&m_forward);
+               Cvar_RegisterVariable (&m_side);
+
+               Cvar_RegisterVariable (&cl_itembobspeed);
+               Cvar_RegisterVariable (&cl_itembobheight);
+
+               CL_Demo_Init();
+
+               Cmd_AddCommand(CMD_CLIENT, "entities", CL_PrintEntities_f, "print information on network entities known to client");
+               Cmd_AddCommand(CMD_CLIENT, "disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
+               Cmd_AddCommand(CMD_CLIENT, "connect", CL_Connect_f, "connect to a server by IP address or hostname");
+               Cmd_AddCommand(CMD_CLIENT | CMD_CLIENT_FROM_SERVER, "reconnect", CL_Reconnect_f, "reconnect to the last server you were on, or resets a quakeworld connection (do not use if currently playing on a netquake server)");
+
+               // Support Client-side Model Index List
+               Cmd_AddCommand(CMD_CLIENT, "cl_modelindexlist", CL_ModelIndexList_f, "list information on all models in the client modelindex");
+               // Support Client-side Sound Index List
+               Cmd_AddCommand(CMD_CLIENT, "cl_soundindexlist", CL_SoundIndexList_f, "list all sounds in the client soundindex");
+
+               Cmd_AddCommand(CMD_CLIENT, "fog", CL_Fog_f, "set global fog parameters (density red green blue [alpha [mindist [maxdist [top [fadedepth]]]]])");
+               Cmd_AddCommand(CMD_CLIENT, "fog_heighttexture", CL_Fog_HeightTexture_f, "set global fog parameters (density red green blue alpha mindist maxdist top depth textures/mapname/fogheight.tga)");
+
+               Cmd_AddCommand(CMD_CLIENT, "cl_areastats", CL_AreaStats_f, "prints statistics on entity culling during collision traces");
+
+               Cvar_RegisterVariable(&r_draweffects);
+               Cvar_RegisterVariable(&cl_explosions_alpha_start);
+               Cvar_RegisterVariable(&cl_explosions_alpha_end);
+               Cvar_RegisterVariable(&cl_explosions_size_start);
+               Cvar_RegisterVariable(&cl_explosions_size_end);
+               Cvar_RegisterVariable(&cl_explosions_lifetime);
+               Cvar_RegisterVariable(&cl_stainmaps);
+               Cvar_RegisterVariable(&cl_stainmaps_clearonload);
+               Cvar_RegisterVariable(&cl_beams_polygons);
+               Cvar_RegisterVariable(&cl_beams_quakepositionhack);
+               Cvar_RegisterVariable(&cl_beams_instantaimhack);
+               Cvar_RegisterVariable(&cl_beams_lightatend);
+               Cvar_RegisterVariable(&cl_noplayershadow);
+               Cvar_RegisterVariable(&cl_dlights_decayradius);
+               Cvar_RegisterVariable(&cl_dlights_decaybrightness);
+
+               Cvar_RegisterVariable(&cl_prydoncursor);
+               Cvar_RegisterVariable(&cl_prydoncursor_notrace);
+
+               Cvar_RegisterVariable(&cl_deathnoviewmodel);
+
+               // for QW connections
+               Cvar_RegisterVariable(&qport);
+               Cvar_SetValueQuick(&qport, (rand() * RAND_MAX + rand()) & 0xffff);
+
+               Cmd_AddCommand(CMD_CLIENT, "timerefresh", CL_TimeRefresh_f, "turn quickly and print rendering statistcs");
+
+               Cvar_RegisterVariable(&cl_locs_enable);
+               Cvar_RegisterVariable(&cl_locs_show);
+               Cmd_AddCommand(CMD_CLIENT, "locs_add", CL_Locs_Add_f, "add a point or box location (usage: x y z[ x y z] \"name\", if two sets of xyz are supplied it is a box, otherwise point)");
+               Cmd_AddCommand(CMD_CLIENT, "locs_removenearest", CL_Locs_RemoveNearest_f, "remove the nearest point or box (note: you need to be very near a box to remove it)");
+               Cmd_AddCommand(CMD_CLIENT, "locs_clear", CL_Locs_Clear_f, "remove all loc points/boxes");
+               Cmd_AddCommand(CMD_CLIENT, "locs_reload", CL_Locs_Reload_f, "reload .loc file for this map");
+               Cmd_AddCommand(CMD_CLIENT, "locs_save", CL_Locs_Save_f, "save .loc file for this map containing currently defined points and boxes");
+
+               Cvar_RegisterVariable(&csqc_polygons_defaultmaterial_nocullface);
+
+               CL_Parse_Init();
+               CL_Particles_Init();
+               CL_Screen_Init();
+               CL_MeshEntities_Init();
+
+               CL_Video_Init();
+
+               #ifdef CONFIG_MENU
+               Cbuf_InsertText(&cmd_client,"menu_start\n");
+               #endif
+       }
 }