fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid unintended clamping when approaching slopes the wrong way (typically because of minor precision issues).

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5517 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-08-19 16:01:24 +00:00
parent e9e15b77f6
commit a6ec9fd9b5
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
engine/client/cl_pred.c
View file

@ -495,7 +495,7 @@ void CL_CalcCrouch (playerview_t *pv)
VectorCopy (pv->simorg, pv->oldorigin); VectorCopy (pv->simorg, pv->oldorigin);
if (pv->onground && orgz - pv->oldz)// > 0) if (pv->onground && orgz - pv->oldz)
{ {
if (pv->oldz > orgz) if (pv->oldz > orgz)
{ //stepping down should be a little faster than stepping up. { //stepping down should be a little faster than stepping up.
@ -509,7 +509,7 @@ void CL_CalcCrouch (playerview_t *pv)
if (pv->crouchspeed > -160*2) if (pv->crouchspeed > -160*2)
{ {
pv->extracrouch = orgz - pv->oldz + host_frametime * 400 + 15; pv->extracrouch = orgz - pv->oldz + host_frametime * 400 + 15;
// pv->extracrouch = max(pv->extracrouch, -5); pv->extracrouch = max(pv->extracrouch, -5);
} }
pv->crouchspeed = -160*2; pv->crouchspeed = -160*2;
} }
@ -519,9 +519,11 @@ void CL_CalcCrouch (playerview_t *pv)
pv->oldz = orgz; pv->oldz = orgz;
if (pv->oldz > orgz + 15 - pv->extracrouch) if (pv->oldz > orgz + 15 - pv->extracrouch)
pv->oldz = orgz + 15 - pv->extracrouch; pv->oldz = orgz + 15 + pv->extracrouch;
if (pv->extracrouch < -host_frametime*400)
pv->extracrouch += host_frametime * 400; pv->extracrouch += host_frametime * 400;
pv->extracrouch = min(pv->extracrouch, 0); else if (pv->extracrouch < 0)
pv->extracrouch = 0;
} }
else else
{ {
@ -545,10 +547,12 @@ void CL_CalcCrouch (playerview_t *pv)
// if (orgz - pv->oldz > 15 + pv->extracrouch) // if (orgz - pv->oldz > 15 + pv->extracrouch)
if (pv->oldz < orgz - 15 - pv->extracrouch) if (pv->oldz < orgz - 15 + pv->extracrouch)
pv->oldz = orgz - 15 - pv->extracrouch; pv->oldz = orgz - 15 - pv->extracrouch;
if (pv->extracrouch >= host_frametime * 200)
pv->extracrouch -= host_frametime * 200; pv->extracrouch -= host_frametime * 200;
pv->extracrouch = max(pv->extracrouch, 0); else if (pv->extracrouch > 0)
pv->extracrouch = 0;
} }
pv->crouch = pv->oldz - orgz; pv->crouch = pv->oldz - orgz;