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);
}
}
cls.qw_downloadnumber++;
cls.qw_downloadpercent = 0;
+ cls.qw_downloadmemorycursize = 0;
return false;
}
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));
// check memory integrity
Mem_CheckSentinelsGlobal();
- MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
- MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0));
+ if (cls.netcon)
+ {
+ MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
+ MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0));
+ }
cls.state = ca_connected;
cls.signon = 1;
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);
CL_Effect(org, modelindex, startframe, framecount, framerate);
}
-void CL_ParseBeam (model_t *m, int lightning)
+void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
{
- int i, ent;
- vec3_t start, end;
+ int i;
beam_t *b = NULL;
- ent = (unsigned short) MSG_ReadShort ();
- MSG_ReadVector(start, cls.protocol);
- MSG_ReadVector(end, cls.protocol);
-
if (ent >= MAX_EDICTS)
{
- Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent);
+ Con_Printf("CL_NewBeam: invalid entity number %i\n", ent);
ent = 0;
}
// if the entity was not found then just replace an unused beam
if (i == cl.max_beams)
for (i = 0, b = cl.beams;i < cl.max_beams;i++, b++)
- if (!b->model || b->endtime < cl.time)
+ if (!b->model)
break;
if (i < cl.max_beams)
{
b->entity = ent;
b->lightning = lightning;
b->model = m;
- b->endtime = cl.time + 0.2;
+ b->endtime = cl.mtime[0] + 0.2;
VectorCopy (start, b->start);
VectorCopy (end, b->end);
- b->relativestartvalid = 0;
- if (ent && cl.entities[ent].state_current.active)
- {
- entity_state_t *p;
- matrix4x4_t matrix, imatrix;
- if (ent == cl.viewentity && cl.movement)
- p = &cl.entities[b->entity].state_previous;
- else
- p = &cl.entities[b->entity].state_current;
- // not really valid yet, we need to get the orientation now
- // (ParseBeam flagged this because it is received before
- // entities are received, by now they have been received)
- // note: because players create lightning in their think
- // function (which occurs before movement), they actually
- // have some lag in it's location, so compare to the
- // previous player state, not the latest
- Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2], -p->angles[0], p->angles[1], p->angles[2], 1);
- Matrix4x4_Invert_Simple(&imatrix, &matrix);
- Matrix4x4_Transform(&imatrix, b->start, b->relativestart);
- Matrix4x4_Transform(&imatrix, b->end, b->relativeend);
- b->relativestartvalid = 1;
- }
}
else
Con_Print("beam list overflow!\n");
}
+void CL_ParseBeam (model_t *m, int lightning)
+{
+ int ent;
+ vec3_t start, end;
+
+ ent = (unsigned short) MSG_ReadShort ();
+ MSG_ReadVector(start, cls.protocol);
+ MSG_ReadVector(end, cls.protocol);
+
+ if (ent >= MAX_EDICTS)
+ {
+ Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent);
+ ent = 0;
+ }
+
+ CL_NewBeam(ent, start, end, m, lightning);
+}
+
void CL_ParseTempEntity(void)
{
int type;
else if (cl_shownet.integer == 2)
Con_Print("------------------\n");
- cl.onground = false; // unless the server says otherwise
//
// parse the message
//
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++)
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:
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:
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:
projects / xonotic / darkplaces.git / blobdiff