[nexuiz-commits] r8347 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-12-02 08:16:55 -0500 (Wed, 02 Dec 2009)
New Revision: 8347

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/t_teleporters.qc
Log:
cvar "g_teleport_maxspeed" for global speed teleporter speed caps (if a misc_teleporter_dest also contains a speed cap then the smallest of these will be used)


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-01 10:00:04 UTC (rev 8346)
+++ trunk/data/defaultNexuiz.cfg	2009-12-02 13:16:55 UTC (rev 8347)
@@ -311,6 +311,8 @@
 
 set g_telefrags 1
 set g_telefrags_avoid 0
+set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
+
 // fragmessage: This allows extra information to be displayed with the frag centerprints. 
 set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"

Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc	2009-12-01 10:00:04 UTC (rev 8346)
+++ trunk/data/qcsrc/server/t_teleporters.qc	2009-12-02 13:16:55 UTC (rev 8347)
@@ -187,6 +187,9 @@
 	if(e.speed)
 		if(vlen(other.velocity) > e.speed)
 			other.velocity = normalize(other.velocity) * max(0, e.speed);
+	if(cvar("g_teleport_maxspeed"))
+		if(vlen(other.velocity) > cvar("g_teleport_maxspeed"))
+			other.velocity = normalize(other.velocity) * max(0, cvar("g_teleport_maxspeed"));
 
 	o = e.origin + '0 0 1' * (1 - other.mins_z - 24);
 	TeleportPlayer(self, other, o, e.mangle, v_forward * vlen(other.velocity), '0 0 0', '0 0 0');