about summary refs log tree commit diff
path: root/src/game/server/gamecontroller.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-01-17 15:55:23 +0100
committeroy <Tom_Adams@web.de>2011-01-17 15:55:23 +0100
commit99e9d4910a4eb28cde118c0cc42eec750068b02d (patch)
tree7ed5548e7a718c88c3edbe3e538795b6423cb2cf /src/game/server/gamecontroller.cpp
parent232aafa89157839cc63eef28795037f5fe2b15b4 (diff)
downloadzcatch-99e9d4910a4eb28cde118c0cc42eec750068b02d.tar.gz
zcatch-99e9d4910a4eb28cde118c0cc42eec750068b02d.zip
fixed that team mates are regarded when evaluating the spawn position. Closes #426
Diffstat (limited to 'src/game/server/gamecontroller.cpp')
-rw-r--r--src/game/server/gamecontroller.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 23a5e171..8ba69398 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -51,10 +51,7 @@ float IGameController::EvaluateSpawnPos(CSpawnEval *pEval, vec2 Pos)
 			Scoremod = 0.5f;
 			
 		float d = distance(Pos, pC->m_Pos);
-		if(d == 0)
-			Score += 1000000000.0f;
-		else
-			Score += 1.0f/d;
+		Score += Scoremod * (d == 0 ? 1000000000.0f : 1.0f/d);
 	}
 	
 	return Score;