Some refactoring
This commit is contained in:
parent
31d23ee16c
commit
bcdb2e3ba5
1 changed files with 13 additions and 11 deletions
24
cl_main.c
24
cl_main.c
|
@ -407,12 +407,13 @@ float CL_LerpPoint (void)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
===============
|
===============
|
||||||
CL_RelinkEntities
|
CL_UpdateEntities
|
||||||
|
|
||||||
PENTA: Modifications in dynamic light handling.
|
This updates the client side entity lists.
|
||||||
|
Called every frame.
|
||||||
===============
|
===============
|
||||||
*/
|
*/
|
||||||
void CL_RelinkEntities (void)
|
void CL_UpdateEntities (void)
|
||||||
{
|
{
|
||||||
entity_t *ent;
|
entity_t *ent;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
@ -450,17 +451,17 @@ void CL_RelinkEntities (void)
|
||||||
|
|
||||||
bobjrotate = anglemod(100*cl.time);
|
bobjrotate = anglemod(100*cl.time);
|
||||||
|
|
||||||
// start on the entity after the world
|
//Start on the entity after the world
|
||||||
for (i=1,ent=cl_entities+1 ; i<cl.num_entities ; i++,ent++)
|
for (i=1,ent=cl_entities+1 ; i<cl.num_entities ; i++,ent++)
|
||||||
{
|
{
|
||||||
if (!ent->model)
|
//Empty slot
|
||||||
{ // empty slot
|
if (!ent->model) {
|
||||||
if (ent->forcelink)
|
if (ent->forcelink)
|
||||||
R_RemoveEfrags (ent); // just became empty
|
R_RemoveEfrags (ent); // Free any entity framents use by this entity
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the object wasn't included in the last packet, remove it
|
//If the object wasn't included in the last packet, remove it
|
||||||
if (ent->msgtime != cl.mtime[0])
|
if (ent->msgtime != cl.mtime[0])
|
||||||
{
|
{
|
||||||
ent->model = NULL;
|
ent->model = NULL;
|
||||||
|
@ -477,7 +478,7 @@ void CL_RelinkEntities (void)
|
||||||
R_FillEntityLeafs (ent);
|
R_FillEntityLeafs (ent);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ // if the delta is large, assume a teleport and don't lerp
|
{ //If the delta is large, assume a teleport and don't lerp
|
||||||
f = frac;
|
f = frac;
|
||||||
for (j=0 ; j<3 ; j++)
|
for (j=0 ; j<3 ; j++)
|
||||||
{
|
{
|
||||||
|
@ -486,7 +487,8 @@ void CL_RelinkEntities (void)
|
||||||
f = 1; // assume a teleportation, not a motion
|
f = 1; // assume a teleportation, not a motion
|
||||||
}
|
}
|
||||||
|
|
||||||
// interpolate the origin and angles
|
//Interpolate the origin and angles between the last to updates
|
||||||
|
//from the server
|
||||||
for (j=0 ; j<3 ; j++)
|
for (j=0 ; j<3 ; j++)
|
||||||
{
|
{
|
||||||
ent->origin[j] = ent->msg_origins[1][j] + f*delta[j];
|
ent->origin[j] = ent->msg_origins[1][j] + f*delta[j];
|
||||||
|
@ -743,7 +745,7 @@ int CL_ReadFromServer (void)
|
||||||
if (cl_shownet.value)
|
if (cl_shownet.value)
|
||||||
Con_Printf ("\n");
|
Con_Printf ("\n");
|
||||||
|
|
||||||
CL_RelinkEntities ();
|
CL_UpdateEntities ();
|
||||||
CL_UpdateTEnts ();
|
CL_UpdateTEnts ();
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue