X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=8a73e6799afb6436a3fa23ca9b73995908ae8092;hb=180cb09570fa9bc40e8747b7ef05dfbe710aff83;hp=da576360aa259a281578ed4e9530b68f81acdd45;hpb=616c74840d75417a886e4b4150a92065b4e90f5e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index da576360a..8a73e6799 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)
@@ -75,16 +75,13 @@ void CreatureFrame (void)
 				else
 					dm = min((dm - cvar("g_balance_falldamage_minspeed")) * cvar("g_balance_falldamage_factor"), cvar("g_balance_falldamage_maxdamage"));
 				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');
-				}
 			}
 
+			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,15 +189,19 @@ 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");
 	sv_warsowbunny_topspeed = cvar("sv_warsowbunny_topspeed");
 	sv_warsowbunny_turnaccel = cvar("sv_warsowbunny_turnaccel");
 	sv_warsowbunny_backtosideratio = cvar("sv_warsowbunny_backtosideratio");
-	sv_speedlimit = cvar("sv_speedlimit");
+	sv_airspeedlimit_nonqw = cvar("sv_airspeedlimit_nonqw");
 	teamplay = cvar ("teamplay");
 	sys_frametime = cvar("sys_ticrate") * cvar("slowmo");
+	if(sys_frametime <= 0)
+		sys_frametime = 1.0 / 60.0; // somewhat safe fallback
+	sv_doublejump = cvar("sv_doublejump");
 
 	if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2)
 		orig_slowmo = cvar("slowmo"); // slowmo will be restored after the timeout