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

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 25340976d32605f8af2c832f8668ceee8717aa44..11688accf81d35dbab2065dbaee0c46f7f02a4b1 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -341,15 +341,15 @@ void CL_ParseEntityLump(char *entdata)
                else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
                        R_SetSkyBox(value);
                else if (!strcmp("fog", key))
-                       sscanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
+                       sscanf(value, "%f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue);
                else if (!strcmp("fog_density", key))
-                       fog_density = atof(value);
+                       r_refdef.fog_density = atof(value);
                else if (!strcmp("fog_red", key))
-                       fog_red = atof(value);
+                       r_refdef.fog_red = atof(value);
                else if (!strcmp("fog_green", key))
-                       fog_green = atof(value);
+                       r_refdef.fog_green = atof(value);
                else if (!strcmp("fog_blue", key))
-                       fog_blue = atof(value);
+                       r_refdef.fog_blue = atof(value);
        }
 }
 
@@ -391,6 +391,7 @@ static qboolean QW_CL_CheckOrDownloadFile(const char *filename)
 
        cls.qw_downloadnumber++;
        cls.qw_downloadpercent = 0;
+       cls.qw_downloadmemorycursize = 0;
 
        return false;
 }
@@ -495,6 +496,8 @@ static void QW_CL_RequestNextDownload(void)
 
                R_Modules_NewMap();
 
+               // TODO: add pmodel/emodel player.mdl/eyes.mdl CRCs to userinfo
+
                // done checking sounds and models, send a prespawn command now
                MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
                MSG_WriteString(&cls.netcon->message, va("prespawn %i 0 %i", cl.qw_servercount, cl.model_precache[1]->brush.qw_md4sum2));
@@ -1212,9 +1215,11 @@ void CL_MoveLerpEntityStates(entity_t *ent)
                ent->persistent.muzzleflash = 0;
                VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
        }
-       else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000)
+       else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
        {
                // don't interpolate the move
+               // (the fixangle[] check detects teleports, but not constant fixangles
+               //  such as when spectating)
                ent->persistent.lerpdeltatime = 0;
                ent->persistent.lerpstarttime = cl.mtime[1];
                VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
@@ -2082,7 +2087,6 @@ void CL_ParseServerMessage(void)
        else if (cl_shownet.integer == 2)
                Con_Print("------------------\n");
 
-       cl.onground = false;    // unless the server says otherwise
 //
 // parse the message
 //
@@ -2095,6 +2099,13 @@ void CL_ParseServerMessage(void)
                cl.mtime[1] = cl.mtime[0];
                cl.mtime[0] = realtime; // qw has no clock
                cl.movement_needupdate = true;
+               // if true the cl.viewangles are interpolated from cl.mviewangles[]
+               // during this frame
+               // (makes spectating players much smoother and prevents mouse movement from turning)
+               cl.fixangle[1] = cl.fixangle[0];
+               cl.fixangle[0] = false;
+               if (!cls.demoplayback)
+                       VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
 
                // slightly kill qw player entities each frame
                for (i = 1;i < cl.maxclients;i++)
@@ -2104,7 +2115,7 @@ void CL_ParseServerMessage(void)
                cl.qw_num_nails = 0;
 
                // fade weapon view kick
-               cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * cl.frametime, 0);
+               cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * (cl.time - cl.oldtime), 0);
 
                while (1)
                {
@@ -2201,6 +2212,14 @@ void CL_ParseServerMessage(void)
                        case qw_svc_setangle:
                                for (i=0 ; i<3 ; i++)
                                        cl.viewangles[i] = MSG_ReadAngle (cls.protocol);
+                               if (!cls.demoplayback)
+                               {
+                                       cl.fixangle[0] = true;
+                                       VectorCopy(cl.viewangles, cl.mviewangles[0]);
+                                       // disable interpolation if this is new
+                                       if (!cl.fixangle[1])
+                                               VectorCopy(cl.viewangles, cl.mviewangles[1]);
+                               }
                                break;
 
                        case qw_svc_lightstyle:
@@ -2496,6 +2515,13 @@ void CL_ParseServerMessage(void)
                                cl.mtime[1] = cl.mtime[0];
                                cl.mtime[0] = MSG_ReadFloat ();
                                cl.movement_needupdate = true;
+                               // if true the cl.viewangles are interpolated from cl.mviewangles[]
+                               // during this frame
+                               // (makes spectating players much smoother and prevents mouse movement from turning)
+                               cl.fixangle[1] = cl.fixangle[0];
+                               cl.fixangle[0] = false;
+                               if (!cls.demoplayback)
+                                       VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
                                break;
 
                        case svc_clientdata:
@@ -2545,6 +2571,14 @@ void CL_ParseServerMessage(void)
                        case svc_setangle:
                                for (i=0 ; i<3 ; i++)
                                        cl.viewangles[i] = MSG_ReadAngle (cls.protocol);
+                               if (!cls.demoplayback)
+                               {
+                                       cl.fixangle[0] = true;
+                                       VectorCopy(cl.viewangles, cl.mviewangles[0]);
+                                       // disable interpolation if this is new
+                                       if (!cl.fixangle[1])
+                                               VectorCopy(cl.viewangles, cl.mviewangles[1]);
+                               }
                                break;
 
                        case svc_setview: