From: terencehill <piuntn@gmail.com>
Date: Sun, 10 Feb 2013 19:42:03 +0000 (+0100)
Subject: Fix CA scoring: it was added a point to the team for every kill
X-Git-Tag: xonotic-v0.7.0~61^2~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a6b89e1e2ab76d1a9bfab6f76ef797b139fa147;p=xonotic%2Fxonotic-data.pk3dir.git

Fix CA scoring: it was added a point to the team for every kill
---

diff --git a/qcsrc/server/mutators/gamemode_arena.qc b/qcsrc/server/mutators/gamemode_arena.qc
index 4b88eefb2..6e4d8e39d 100644
--- a/qcsrc/server/mutators/gamemode_arena.qc
+++ b/qcsrc/server/mutators/gamemode_arena.qc
@@ -230,7 +230,7 @@ MUTATOR_HOOKFUNCTION(arena_ForbidPlayerScore_Clear)
 MUTATOR_HOOKFUNCTION(arena_GiveFragsForKill)
 {
 	if(arena_roundbased)
-		frag_score = 0;
+		frag_score = 0; // score will be given to the champion when the round ends
 	return 1;
 }
 
diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 5fffa1601..291166fe7 100644
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -219,6 +219,12 @@ MUTATOR_HOOKFUNCTION(ca_ForbidThrowCurrentWeapon)
 	return 1;
 }
 
+MUTATOR_HOOKFUNCTION(ca_GiveFragsForKill)
+{
+	frag_score = 0; // score will be given to the winner team when the round ends
+	return 1;
+}
+
 void ca_Initialize()
 {
 	allowed_to_spawn = TRUE;
@@ -243,6 +249,7 @@ MUTATOR_DEFINITION(gamemode_ca)
 	MUTATOR_HOOK(PlayerPreThink, ca_PlayerPreThink, CBC_ORDER_ANY);
 	MUTATOR_HOOK(ForbidPlayerScore_Clear, ca_ForbidPlayerScore_Clear, CBC_ORDER_ANY);
 	MUTATOR_HOOK(ForbidThrowCurrentWeapon, ca_ForbidThrowCurrentWeapon, CBC_ORDER_ANY);
+	MUTATOR_HOOK(GiveFragsForKill, ca_GiveFragsForKill, CBC_ORDER_FIRST);
 
 	MUTATOR_ONADD
 	{