X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=8a73e6799afb6436a3fa23ca9b73995908ae8092;hb=180cb09570fa9bc40e8747b7ef05dfbe710aff83;hp=44a47c95dc5ed653c2cf40afb68bf7c788570b5d;hpb=ebd49bd4d552234b9b186d051fcc7d2313df91ca;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 44a47c95d..8a73e6799 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -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"); @@ -201,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)