From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 4 Jun 2010 21:24:15 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/speedlimit
X-Git-Tag: xonotic-v0.1.0preview~553^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07c6b6356a0c24dcc4c3b7468728b6d96014d446;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/speedlimit
---

07c6b6356a0c24dcc4c3b7468728b6d96014d446
diff --cc qcsrc/server/sv_main.qc
index da576360a,f4cc87445..85ff7760b
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@@ -198,9 -198,9 +198,10 @@@ void StartFrame (void
  	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");
  	teamplay = cvar ("teamplay");
  	sys_frametime = cvar("sys_ticrate") * cvar("slowmo");
+ 	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