From: MrBougo <mrbougo@xonotic.org>
Date: Fri, 9 Jul 2010 18:27:51 +0000 (+0200)
Subject: make the shooting star death available outside of debug
X-Git-Tag: xonotic-v0.1.0preview~462
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33c0f26a27afd75090e04f0606616ec32487718c;p=xonotic%2Fxonotic-data.pk3dir.git

make the shooting star death available outside of debug

new cvar: g_maxspeed, 0 default (no limits), any player who goes faster gets killed
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 307f58fa7..19fe9fef5 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1847,3 +1847,5 @@ set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"
 
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
+
+set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)"
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 45320f2db..a79f9a473 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -2,7 +2,7 @@
 void CreatureFrame (void)
 {
 	local entity oldself;
-	local float dm;
+	local float dm, maxspeed;
 	oldself = self;
 	self = findfloat(world, iscreature, TRUE);
 	while (self)
@@ -78,13 +78,12 @@ void CreatureFrame (void)
 				{
 					Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');
 				}
-				else if(vlen(self.velocity) > 100000 && cvar("developer"))
-				{
-					dprint(strcat(self.netname, " became too fast, please investigate: ", vtos(self.spawnorigin), "\n"));
-					Damage (self, world, world, 50000, DEATH_SHOOTING_STAR, self.origin, '0 0 0');
-				}
 			}
 
+			maxspeed = cvar("g_maxspeed");
+			if(maxspeed > 0 && vlen(self.velocity) > maxspeed)
+				Damage (self, world, world, 100000, DEATH_SHOOTING_STAR, self.origin, '0 0 0');
+
 			// play stupid sounds
 			if (g_footsteps)
 			if (!gameover)