X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=a5f35aa89ae3bc04a0e8d51d9ab5587dea084c1d;hb=2fb4172213439edb17c1d116747c75f9540f2017;hp=a79f9a473b0638911a9918f2ec78513eab9a0cca;hpb=e97a2b023da3c3177d0292a4ad343e770a8ae71a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index a79f9a473..a5f35aa89 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -34,7 +34,7 @@ void CreatureFrame (void)
 				}
 				if (self.dmgtime < time)
 				{
-					self.dmgtime = time + 0.1;
+					self.dmgtime = time + 0.2;
 					if (self.watertype == CONTENT_LAVA)
 					{
 						if (self.watersound_finished < time)
@@ -75,9 +75,7 @@ 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');
-				}
 			}
 
 			maxspeed = cvar("g_maxspeed");
@@ -191,6 +189,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");
@@ -200,6 +199,8 @@ void StartFrame (void)
 	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)