From: Mario <mario.mario@y7mail.com>
Date: Wed, 4 Jun 2014 23:00:11 +0000 (+1000)
Subject: Merge branch 'master' into Mario/race_cts_mutators
X-Git-Tag: xonotic-v0.8.0~164^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b15197339e0263e56a6684f8a1b3890ba6d367b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/race_cts_mutators
---

7b15197339e0263e56a6684f8a1b3890ba6d367b
diff --cc qcsrc/server/anticheat.qc
index 11c758ef4,9a1872c89..fd78214c8
--- a/qcsrc/server/anticheat.qc
+++ b/qcsrc/server/anticheat.qc
@@@ -92,6 -141,71 +140,25 @@@ void anticheat_physics(
  		MEAN_ACCUMULATE(anticheat_speedhack, max(0, f - self.anticheat_speedhack_offset), 1);
  		self.anticheat_speedhack_offset += (f - self.anticheat_speedhack_offset) * frametime * 0.1;
  	}
+ 
+ 	// new generic speedhack detection
+ 	if (self.anticheat_speedhack_lasttime > 0) {
+ 		float dt = servertime - self.anticheat_speedhack_lasttime;
+ 		const float falloff = 0.2;
+ 		self.anticheat_speedhack_accu *= exp(-dt * falloff);
+ 		self.anticheat_speedhack_accu += frametime * falloff;
+ 		// NOTE: at cl_netfps x, this actually averages not to 1, but to 1/x * falloff / (1 - exp(-1/x * falloff))
+ 		// For 15 netfps (absolute minimum bearable), and 0.2 falloff, this is: 1.0067
+ 		self.anticheat_speedhack_lasttime = servertime;
+ 		MEAN_ACCUMULATE(anticheat_speedhack_m1, self.anticheat_speedhack_accu, frametime);
+ 		MEAN_ACCUMULATE(anticheat_speedhack_m2, self.anticheat_speedhack_accu, frametime);
+ 		MEAN_ACCUMULATE(anticheat_speedhack_m3, self.anticheat_speedhack_accu, frametime);
+ 		MEAN_ACCUMULATE(anticheat_speedhack_m4, self.anticheat_speedhack_accu, frametime);
+ 		MEAN_ACCUMULATE(anticheat_speedhack_m5, self.anticheat_speedhack_accu, frametime);
+ 	} else {
+ 		self.anticheat_speedhack_accu = 1;
+ 		self.anticheat_speedhack_lasttime = servertime;
+ 	}
 -
 -	// race/CTS: force kbd movement for fairness
 -	if(g_race || g_cts)
 -	{
 -		// if record times matter
 -		// ensure nothing EVIL is being done (i.e. div0_evade)
 -		// this hinders joystick users though
 -		// but it still gives SOME analog control
 -		wishvel_x = fabs(self.movement_x);
 -		wishvel_y = fabs(self.movement_y);
 -		if(wishvel_x != 0 && wishvel_y != 0 && wishvel_x != wishvel_y)
 -		{
 -			wishvel_z = 0;
 -			wishspeed = vlen(wishvel);
 -			if(wishvel_x >= 2 * wishvel_y)
 -			{
 -				// pure X motion
 -				if(self.movement_x > 0)
 -					self.movement_x = wishspeed;
 -				else
 -					self.movement_x = -wishspeed;
 -				self.movement_y = 0;
 -			}
 -			else if(wishvel_y >= 2 * wishvel_x)
 -			{
 -				// pure Y motion
 -				self.movement_x = 0;
 -				if(self.movement_y > 0)
 -					self.movement_y = wishspeed;
 -				else
 -					self.movement_y = -wishspeed;
 -			}
 -			else
 -			{
 -				// diagonal
 -				if(self.movement_x > 0)
 -					self.movement_x = M_SQRT1_2 * wishspeed;
 -				else
 -					self.movement_x = -M_SQRT1_2 * wishspeed;
 -				if(self.movement_y > 0)
 -					self.movement_y = M_SQRT1_2 * wishspeed;
 -				else
 -					self.movement_y = -M_SQRT1_2 * wishspeed;
 -			}
 -		}
 -	}
  }
  
  void anticheat_spectatecopy(entity spectatee)
diff --cc qcsrc/server/teamplay.qc
index 23f4c1963,a0c80dbd2..87ea68d79
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -243,16 -246,14 +248,10 @@@ void InitGameplayMode(
  		else
  			g_race_qualifying = 0;
  	}
- 	
- 	if(g_invasion)
- 	{
- 		inv_maxrounds = cvar("fraglimit");
- 		cvar_set("fraglimit", "0");
- 	}
  
  	if(g_race || g_cts)
 -	{
 -		if(g_race_qualifying)
 -			independent_players = 1;
 -
 -		ScoreRules_race();
 -	}
 +	if(g_race_qualifying)
 +		independent_players = 1;
  
  	InitializeEntity(world, default_delayedinit, INITPRIO_GAMETYPE_FALLBACK);
  }