From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 13 Aug 2011 03:51:05 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/pathfinding-optimizations
X-Git-Tag: xonotic-v0.5.0~140^2~2^2^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fa5cce8eeaabf0319467af3a99dc27d46c4c746d

Merge branch 'master' into mand1nga/pathfinding-optimizations

Conflicts:
	qcsrc/server/bot/navigation.qc
---

fa5cce8eeaabf0319467af3a99dc27d46c4c746d
diff --cc qcsrc/server/bot/navigation.qc
index ee1d60ffa4,ebaf210b3c..2d66b02132
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@@ -644,9 -645,7 +645,11 @@@ void navigation_routerating(entity e, f
  	if (!e)
  		return;
  
 +	if(e.blacklisted)
 +		return;
 +
+ 	o = (e.absmin + e.absmax) * 0.5;
++
  	//print("routerating ", etos(e), " = ", ftos(f), " - ", ftos(rangebias), "\n");
  
  	// Evaluate path using jetpack