Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/fix_antilag_teleporttime
git-manager created issue #411 (closed) on 2011-04-15T21:33:22Z:
Purpose of the branch:
Fixes a major bug with g_multijump, causing insane speeds when respawning and pressing jump + forward. Antilag takeback velocity compares origins to determine velocity over a given amount of time. And if this float isn't set, it compares the distance from where the player was and where he respawns, causing insane speeds. This is already set for teleporters, but this commit also adds it when respawning, since we are teleported to another origin.
Repository: xonotic/xonotic-data.pk3dir.git Commit: 44a728d4 Branch: mirceakitsune/fix_antilag_teleporttime
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '44a728d415b656dc8def88daf949d0a56533dfc5'..'origin/mirceakitsune/fix_antilag_teleporttime'
git merge --no-ff 'origin/mirceakitsune/fix_antilag_teleporttime'
git push && git push --delete origin 'mirceakitsune/fix_antilag_teleporttime'
Diffstat:
qcsrc/server/cl_client.qc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Revision log:
commit 44a728d415b656dc8def88daf949d0a56533dfc5
Author: Mircea Kitsune
Commit: Mircea Kitsune
Do it AFTER setting the new player origin, else the issue still happens
commit e1ea117191866018eab28a0471caea77dd0e520e
Author: Mircea Kitsune
Commit: Mircea Kitsune
Fixes a major bug with g_multijump, causing insane speeds when respawning and pressing jump + forward. Antilag takeback velocity compares origins to determine velocity over a given amount of time. And if this float isn't set, it compares the distance from where the player was and where he respawns, causing insane speeds. This is already set for teleporters, but this commit also adds it when respawning, since we are teleported to another origin.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/server/cl\_client.qc b/qcsrc/server/cl\_client.qc
index a1047ea..50f149e 100644
— a/qcsrc/server/cl\_client.qc
**+ b/qcsrc/server/cl\_client.qc
@ -997,6 +997,7
@ void PutClientInServer
self.oldorigin = self.origin;
self.prevorigin = self.origin;
self.lastrocket = world; // stop rocket guiding, no revenge from the grave!
- self.lastteleporttime = time; // prevent insane speeds due to changing origin
if(g_arena) {