X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=3b7d77d58be6ef819dfcd4ae68266588e1ed36fc;hb=d561f76342a7e8060a5a1aae4bab3f2bf56c17aa;hp=45320f2db526f0303cb0f3e9d8aed3181e78c9e7;hpb=9c7e68314092345caf25be35a15e2dec576cdff2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 45320f2db..3b7d77d58 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)
@@ -77,14 +77,17 @@ void CreatureFrame (void)
 				if (dm > 0)
 				{
 					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');
+					// this must be allowed to cut the normal pain sounds (played after them and on the same channel)
+					// there's no way to detect falling damage and prevent the pain sounds for this to be played instead
+					if(self.health > 0)
+						PlayerSound(playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 				}
 			}
 
+			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)
@@ -192,6 +195,7 @@ void StartFrame (void)
 	sv_maxairstrafespeed = cvar("sv_maxairstrafespeed");
 	sv_airstrafeaccel_qw = cvar("sv_airstrafeaccel_qw");
 	sv_aircontrol = cvar("sv_aircontrol");
+	sv_aircontrol_penalty = cvar("sv_aircontrol_penalty");
 	sv_aircontrol_power = cvar("sv_aircontrol_power");
 	sv_warsowbunny_airforwardaccel = cvar("sv_warsowbunny_airforwardaccel");
 	sv_warsowbunny_accel = cvar("sv_warsowbunny_accel");