improved setinfo handling so that quakeworld works much better now (name/topcolor...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index c8f058e8556ec27aeb0ba8560e6881d2a300facf..3cba5cb7256aeb4bd8369eee436c2968953a7dc7 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;
@@ -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);
@@ -1093,8 +1140,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        if (len > 0)
                                len = 1.0f / len;
                        VectorScale(vel, len, vel);
-                       len = VectorDistance(origin, e->persistent.trail_origin);
-                       CL_ParticleEffect(trailtype, len, e->persistent.trail_origin, origin, vel, vel, e, e->state_current.glowcolor);
+                       CL_ParticleEffect(trailtype, 1, e->persistent.trail_origin, origin, vel, vel, e, e->state_current.glowcolor);
                }
                VectorCopy(origin, e->persistent.trail_origin);
                // tenebrae's sprites are all additive mode (weird)
@@ -1359,7 +1405,7 @@ void CL_RelinkBeams(void)
                // 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)
+               if (cl_beams_relative.integer >= 1 && b->entity && (b->entity == cl.viewentity || cl_beams_relative.integer >= 2) && cl.entities[b->entity].state_current.active && b->relativestartvalid)
                {
                        entity_render_t *r = &cl.entities[b->entity].render;
                        //Matrix4x4_OriginFromMatrix(&r->matrix, origin);
@@ -1461,7 +1507,6 @@ static void CL_RelinkQWNails(void)
 void CL_LerpPlayer(float frac)
 {
        int i;
-       float d;
 
        cl.viewzoom = cl.mviewzoom[1] + frac * (cl.mviewzoom[0] - cl.mviewzoom[1]);
        for (i = 0;i < 3;i++)
@@ -1470,20 +1515,6 @@ void CL_LerpPlayer(float frac)
                cl.punchvector[i] = cl.mpunchvector[1][i] + frac * (cl.mpunchvector[0][i] - cl.mpunchvector[1][i]);
                cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
        }
-
-       if (cls.demoplayback)
-       {
-               // interpolate the angles
-               for (i = 0;i < 3;i++)
-               {
-                       d = cl.mviewangles[0][i] - cl.mviewangles[1][i];
-                       if (d > 180)
-                               d -= 360;
-                       else if (d < -180)
-                               d += 360;
-                       cl.viewangles[i] = cl.mviewangles[1][i] + frac * d;
-               }
-       }
 }
 
 void CSQC_RelinkAllEntities (int drawmask)