reorganized a lot of renderer variables into r_refdef, and split some things out...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 3b605902aa6a397ed0d08119e7d78f1449da8888..2c0c4ffe6b320faa222912d683ae4e06c39e03c7 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -201,6 +201,53 @@ void CL_ClearState(void)
        CL_Screen_NewMap();
 }
 
+void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allowstarkey, qboolean allowmodel, qboolean quiet)
+{
+       if (strchr(key, '\"') || strchr(value, '\"') || (!allowstarkey && key[0] == '*') || (!allowmodel && (!strcasecmp(Cmd_Argv(1), "pmodel") || !strcasecmp(Cmd_Argv(1), "emodel"))))
+       {
+               if (!quiet)
+                       Con_Printf("Can't setinfo \"%s\" \"%s\"\n");
+               return;
+       }
+       InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), key, value);
+       if (cls.state == ca_connected)
+       {
+               if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               {
+                       MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va("setinfo \"%s\" \"%s\"", key, value));
+               }
+               else if (!strcasecmp(key, "name"))
+               {
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va("name \"%s\"", value));
+               }
+               else if (!strcasecmp(key, "playermodel"))
+               {
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va("playermodel \"%s\"", value));
+               }
+               else if (!strcasecmp(key, "playerskin"))
+               {
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va("playerskin \"%s\"", value));
+               }
+               else if (!strcasecmp(key, "topcolor"))
+               {
+                       // don't send anything, the combined color code will be updated manually
+               }
+               else if (!strcasecmp(key, "bottomcolor"))
+               {
+                       // don't send anything, the combined color code will be updated manually
+               }
+               else if (!strcasecmp(key, "rate"))
+               {
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va("rate \"%s\"", value));
+               }
+       }
+}
+
 void CL_ExpandEntities(int num)
 {
        int i, oldmaxentities;
@@ -803,7 +850,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                e->render.skinnum = e->state_current.skin;
                if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity)
                {
-                       if (!r_drawviewmodel.integer || chase_active.integer || envmap)// || csqc_loaded)
+                       if (!r_drawviewmodel.integer || chase_active.integer || r_refdef.envmap)// || csqc_loaded)
                                return;
                        if (!e->csqc)
                        {
@@ -867,7 +914,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                // if it's the player entity, update according to client movement
                if (e == cl.entities + cl.playerentity && cl.movement)// && !e->csqc)
                {
-                       lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]);
+                       lerp = (cl.time - cl.movement_time[1]) / (cl.movement_time[0] - cl.movement_time[1]);
                        lerp = bound(0, lerp, 1);
                        VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin);
                        VectorSet(angles, 0, cl.viewangles[1], 0);
@@ -1510,7 +1557,7 @@ int CL_ReadFromServer(void)
        r_refdef.time = cl.time;
        r_refdef.extraupdate = !r_speeds.integer;
        r_refdef.numentities = 0;
-       r_refdef.viewentitymatrix = identitymatrix;
+       r_view.matrix = identitymatrix;
 
        if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
@@ -1574,13 +1621,13 @@ static void CL_Fog_f (void)
 {
        if (Cmd_Argc () == 1)
        {
-               Con_Printf("\"fog\" is \"%f %f %f %f\"\n", fog_density, fog_red, fog_green, fog_blue);
+               Con_Printf("\"fog\" is \"%f %f %f %f\"\n", r_refdef.fog_density, r_refdef.fog_red, r_refdef.fog_green, r_refdef.fog_blue);
                return;
        }
-       fog_density = atof(Cmd_Argv(1));
-       fog_red = atof(Cmd_Argv(2));
-       fog_green = atof(Cmd_Argv(3));
-       fog_blue = atof(Cmd_Argv(4));
+       r_refdef.fog_density = atof(Cmd_Argv(1));
+       r_refdef.fog_red = atof(Cmd_Argv(2));
+       r_refdef.fog_green = atof(Cmd_Argv(3));
+       r_refdef.fog_blue = atof(Cmd_Argv(4));
 }
 
 /*
@@ -1602,7 +1649,7 @@ static void CL_TimeRefresh_f (void)
        timestart = Sys_DoubleTime();
        for (i = 0;i < 128;i++)
        {
-               Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2], 0, i / 128.0 * 360.0, 0, 1);
+               Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, r_view.origin[0], r_view.origin[1], r_view.origin[2], 0, i / 128.0 * 360.0, 0, 1);
                CL_UpdateScreen();
        }
        timedelta = Sys_DoubleTime() - timestart;