eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

small cleanup and rocket smoothing by increasing tolerances.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@161 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-09-07 18:22:30 +00:00
parent fb823339cb
commit 3577d534b6
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
engine/client/cl_ents.c
View file

@ -310,14 +310,18 @@ void CL_ParseDelta (entity_state_t *from, entity_state_t *to, int bits, qboolean
if (to->frame != from->frame) if (to->frame != from->frame)
cl.lerpents[to->number].framechange = cl.time; //marked for hl models cl.lerpents[to->number].framechange = cl.time; //marked for hl models
#endif #endif
if (to->modelindex != from->modelindex || to->number != from->number || VectorLength(move)>64) //model changed... or entity changed... if (to->modelindex != from->modelindex || to->number != from->number || VectorLength(move)>128) //model changed... or entity changed...
{ {
#ifdef HALFLIFEMODELS #ifdef HALFLIFEMODELS
cl.lerpents[to->number].framechange = cl.time; //marked for hl models cl.lerpents[to->number].framechange = cl.time; //marked for hl models
#endif #endif
cl.lerpents[to->number].lerptime = -10; cl.lerpents[to->number].lerptime = -10;
if (!new)
return;
move[0] = 1; //make sure it enters the next block.
} }
else if (to->frame != from->frame || move[0] || move[1] || move[2]) if (to->frame != from->frame || move[0] || move[1] || move[2])
{ {
cl.lerpents[to->number].origin[0] = from->origin[0]; cl.lerpents[to->number].origin[0] = from->origin[0];
cl.lerpents[to->number].origin[1] = from->origin[1]; cl.lerpents[to->number].origin[1] = from->origin[1];
@ -340,7 +344,7 @@ void CL_ParseDelta (entity_state_t *from, entity_state_t *to, int bits, qboolean
//store this off for new ents to use. //store this off for new ents to use.
if (new) if (new)
cl.lerpents[to->number].lerptime = newlerprate; cl.lerpents[to->number].lerptime = newlerprate;
if (to->frame == from->frame && !new) if (to->frame == from->frame && !new) //(h2 runs at 20fps)
newlerprate = cl.time-cl.lerpents[to->number].lerptime; newlerprate = cl.time-cl.lerpents[to->number].lerptime;
} }
} }
@ -785,7 +789,7 @@ void CL_LinkPacketEntities (void)
{ {
entity_t *ent; entity_t *ent;
packet_entities_t *pack; packet_entities_t *pack;
entity_state_t *s1, *s2; entity_state_t *s1;
float f; float f;
model_t *model; model_t *model;
vec3_t old_origin; vec3_t old_origin;
@ -798,12 +802,9 @@ void CL_LinkPacketEntities (void)
autorotate = anglemod(100*cl.time); autorotate = anglemod(100*cl.time);
f = 0; // FIXME: no interpolation right now
for (pnum=0 ; pnum<pack->num_entities ; pnum++) for (pnum=0 ; pnum<pack->num_entities ; pnum++)
{ {
s1 = &pack->entities[pnum]; s1 = &pack->entities[pnum];
s2 = s1; // FIXME: no interpolation right now
// spawn light flashes, even ones coming from invisible objects // spawn light flashes, even ones coming from invisible objects
if ((s1->effects & (EF_BLUE | EF_RED)) == (EF_BLUE | EF_RED)) if ((s1->effects & (EF_BLUE | EF_RED)) == (EF_BLUE | EF_RED))
@ -936,13 +937,14 @@ void CL_LinkPacketEntities (void)
ent->oldframe = cl.lerpents[s1->number].frame; ent->oldframe = cl.lerpents[s1->number].frame;
if (!cl.lerpents[s1->number].lerprate) if (!cl.lerpents[s1->number].lerprate)
{
ent->lerptime = 0; ent->lerptime = 0;
}
else else
{ {
ent->lerptime = 1-(cl.time-cl.lerpents[s1->number].lerptime)/cl.lerpents[s1->number].lerprate; ent->lerptime = 1-(cl.time-cl.lerpents[s1->number].lerptime)/cl.lerpents[s1->number].lerprate;
} }
if (ent->lerptime<0)ent->lerptime=0; if (ent->lerptime<0)ent->lerptime=0;
if (ent->lerptime>1)ent->lerptime=1; if (ent->lerptime>1)ent->lerptime=1;
@ -1221,6 +1223,7 @@ void CL_ParsePlayerinfo (void)
int num; int num;
int i; int i;
int new; int new;
vec3_t org, oorg;
lastplayerinfo = num = MSG_ReadByte (); lastplayerinfo = num = MSG_ReadByte ();
if (num >= MAX_CLIENTS) if (num >= MAX_CLIENTS)
@ -1309,9 +1312,11 @@ void CL_ParsePlayerinfo (void)
flags |= MSG_ReadByte()<<16; flags |= MSG_ReadByte()<<16;
state->messagenum = cl.parsecount; state->messagenum = cl.parsecount;
state->origin[0] = MSG_ReadCoord (); org[0] = MSG_ReadCoord ();
state->origin[1] = MSG_ReadCoord (); org[1] = MSG_ReadCoord ();
state->origin[2] = MSG_ReadCoord (); org[2] = MSG_ReadCoord ();
VectorCopy(org, state->origin);
new = MSG_ReadByte (); new = MSG_ReadByte ();
if (state->frame != new) if (state->frame != new)