From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 23 Sep 2010 07:45:40 +0000 (+0200)
Subject: new physics config by Lee Stricklin; fix electro beam through warpzones when standing... 
X-Git-Tag: xonotic-v0.1.0preview~311^2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=9041fcca280badb5dfb2a574023f12e374b46f28;p=xonotic%2Fxonotic-data.pk3dir.git

new physics config by Lee Stricklin; fix electro beam through warpzones when standing close to the warp plane
---

diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg
index a173fc1a2..13f0530db 100644
--- a/physicsLeeStricklin.cfg
+++ b/physicsLeeStricklin.cfg
@@ -1,32 +1,32 @@
 // These have been modified from Nexuiz 2.4.2's physicsQBR.cfg file and a bunch of other crap div0 threw on here :P
 // DO NOT SCREW WITH friction on land, edge friction, step height, or sv_airaccel_qw
 
-sv_gravity 801
-sv_maxspeed 440
-sv_maxairspeed 285
+sv_gravity 818
+sv_maxspeed 420
+sv_maxairspeed 283
 sv_stopspeed 100
-sv_accelerate 20
+sv_accelerate 14
 sv_airaccelerate 8
-sv_friction 6.2
+sv_friction 9.6 // higher values make you slide less
 edgefriction 1 // div0 says no! lol
-sv_stepheight 34 // was told by divVerrent not to mess with this, possibly to avoid breaking maps
-sv_jumpvelocity 310
+sv_stepheight 34 // was told by divVerent not to mess with this, possibly to avoid breaking maps
+sv_jumpvelocity 308
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0 // pain in the ass to tweak without screwing up the strafing
-sv_airaccel_qw -0.93 //given a negative value to combat potential cheats, was told by divVerrent not to mess with it
+sv_airaccel_qw -0.93 //given a negative value to combat potential cheats, was told by divVerent not to mess with it
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
-sv_aircontrol 1
+sv_aircontrol 0
 sv_aircontrol_power 2
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
 sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0 //Was told not to mess with this by divVerrent, can cause hell for anti lag
-sv_doublejump 1
+sv_friction_on_land 0 //Was told not to mess with this by divVerent, can cause hell for anti-lag
+sv_doublejump 0
 sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max 0.38
-sv_jumpspeedcap_max_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 1
 
diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index 9eb749886..8536bd3d2 100644
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -233,7 +233,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 			goto fail;
 		}
 		WarpZone_Trace_AddTransform(wz);
-		org = WarpZone_TransformOrigin(wz, trace_endpos);
+		org = WarpZone_TransformOrigin(wz, org);
 		end = WarpZone_TransformOrigin(wz, end);
 	}
 	WarpZone_MakeAllSolid();