summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaweł Redman <trem.redman@gmail.com>2013-09-15 21:50:58 +0200
committerPaweł Redman <trem.redman@gmail.com>2013-09-15 21:50:58 +0200
commit39de4eb91861f8cb08c0eb05e52869190f6dfdad (patch)
tree6e61b6793d27add246750cb8fc08f98ec7933b64 /src
parente554c1d3ea2d5336fad7da41491dfeee59de6e6b (diff)
parentf82031746211f4d4149ba229fc27e191e97bb7c8 (diff)
Merge branch 'master' of https://github.com/enneract/cuboid
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_ents.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index a68c5eb..339cd8e 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -939,12 +939,24 @@ static void CG_CalcEntityLerpPositions( centity_t *cent )
return;
}
- if( cg_projectileNudge.integer &&
- !cg.demoPlayback &&
- cent->currentState.eType == ET_MISSILE &&
+ if( cent->currentState.eType == ET_MISSILE &&
!( cg.snap->ps.pm_flags & PMF_FOLLOW ) )
{
+ //Default setting, people don't like having to see
+ //projectilenudge with lagged as it screws up their aim
+ if(cg_projectileNudge.integer == 1 &&
+ !cg.demoPlayback && cg_unlagged.integer)
timeshift = cg.ping;
+ //Previous default
+ if(cg_projectileNudge.integer == 2 &&
+ !cg.demoPlayback)
+ timeshift = cg.ping;
+ //Extrapolate using the value instead of ping
+ //for those who think their ping isn't 'real'
+ else if( cg_projectileNudge.integer > 2)
+ timeshift = cg_projectileNudge.integer;
+
+ else timeshift = 0;
}
// just use the current frame and evaluate as best we can