team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed up player lerping. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3934 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2011-12-23 14:36:25 +00:00
parent 1693ba6c58
commit 354879befc
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/client/cl_ents.c
View File

@ -1887,7 +1887,7 @@ qboolean CL_MayLerp(void)
void CL_TransitionEntities (void)
{
packet_entities_t *packnew, *packold;
int newf, oldf;
int newf, newff, oldf;
qboolean nolerp;
float servertime;
@ -1912,6 +1912,7 @@ void CL_TransitionEntities (void)
if (!CL_ChooseInterpolationFrames(&newf, &oldf, servertime))
return;
newff = newf;
newf&=UPDATE_MASK;
oldf&=UPDATE_MASK;
/*transition the ents and stuff*/
@ -1929,6 +1930,12 @@ void CL_TransitionEntities (void)
vec3_t move;
lerpents_t *le;
player_state_t *pnew, *pold;
if (!cl_lerp_players.ival)
{
newf = newff = oldf = cl.parsecount;
newf&=UPDATE_MASK;
oldf&=UPDATE_MASK;
}
if (packnew->servertime == packold->servertime)
frac = 1; //lerp totally into the new
else
@ -1937,11 +1944,11 @@ void CL_TransitionEntities (void)
pold = &cl.frames[oldf].playerstate[0];
for (p = 0; p < cl.allocated_client_slots; p++, pnew++, pold++)
{
if (pnew->messagenum != cl.parsecount)
if (pnew->messagenum != newff)
continue;
le = &cl.lerpplayers[p];
VectorSubtract(pnew->origin, pold->origin, move);
VectorSubtract(pnew->predorigin, pold->predorigin, move);
if (DotProduct(move, move) > 120*120)
frac = 1;
@ -1949,7 +1956,7 @@ void CL_TransitionEntities (void)
//lerp based purely on the packet times,
for (i = 0; i < 3; i++)
{
le->origin[i] = pold->origin[i] + frac*(move[i]);
le->origin[i] = pold->predorigin[i] + frac*(move[i]);
a1 = SHORT2ANGLE(pold->command.angles[i]);
a2 = SHORT2ANGLE(pnew->command.angles[i]);
@ -2629,7 +2636,10 @@ void CL_ParsePlayerinfo (void)
state->state_time = parsecounttime - msec*0.001;
}
else
{
msec = 0;
state->state_time = parsecounttime;
}
if (flags & PF_COMMAND)
{
@ -2776,7 +2786,8 @@ guess_pm_type:
if (cl.worldmodel && cl_lerp_players.ival)
{
player_state_t exact;
msec = 1000*((realtime - cls.latency + 0.02) - state->state_time);
msec += cls.latency*1000;
// msec = 1000*((realtime - cls.latency + 0.02) - state->state_time);
// predict players movement
if (msec > 255)
msec = 255;

2
engine/gl/gl_vidsdl.c
View File

@ -67,7 +67,7 @@ Con_Printf("Getting gamma\n");
return false;
}
SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &gl_canstencil);
SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &gl_stencilbits);
ActiveApp = true;

2
engine/http/httpclient.c
View File

@ -589,7 +589,7 @@ void HTTP_CL_Think(void)
}
link = &con->next;
if (!cls.downloadmethod)
if (!cls.downloadmethod && *con->localname)
{
cls.downloadmethod = DL_HTTP;
showndownload = con;