From e573f411ad50bb77d1073f64e81569343e59de7c Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 28 Sep 2008 09:06:55 +0000
Subject: [PATCH] ctf: count drops too

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4535 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/defaultNexuiz.cfg            | 1 +
 data/qcsrc/client/sbar.qc         | 2 +-
 data/qcsrc/server/ctf.qc          | 1 +
 data/qcsrc/server/scores_rules.qc | 7 +++++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
index 1eea174f1..cb4d326c1 100644
--- a/data/defaultNexuiz.cfg
+++ b/data/defaultNexuiz.cfg
@@ -394,6 +394,7 @@ set g_ctf_flagscore_capture_team	0
 set g_ctf_flagscore_pickup		1
 set g_ctf_flagscore_return		5
 set g_ctf_flagscore_return_rogue	10
+set g_ctf_flagpenalty_drop	0
 set g_ctf_flagscore_kill	1
 set g_ctf_flagcarrier_selfdamage 1
 set g_ctf_flagcarrier_selfforce 0.7
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 2cc329c80..f0eec2e84 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -346,7 +346,7 @@ void Cmd_Sbar_Help(float argc)
 
 string Sbar_DefaultColumnLayout()
 {
-	return "ping pl name | -ctf,kh/kills -ctf,kh/deaths +kh/caps +kh/pushes +kh/destroyed +ctf/caps +ctf/pickups +ctf/fckills +ctf/returns -lms/score";
+	return "ping pl name | -ctf,kh/kills -ctf,kh/deaths +kh/caps +kh/pushes +kh/destroyed +ctf/caps +ctf/pickups +ctf/drops +ctf/fckills +ctf/returns -lms/score";
 }
 
 void Cmd_Sbar_SetFields(float argc)
diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc
index 6d1fc4fda..f70dc9517 100644
--- a/data/qcsrc/server/ctf.qc
+++ b/data/qcsrc/server/ctf.qc
@@ -138,6 +138,7 @@ void DropFlag(entity e, float penalty)
 
 	if(cvar("g_ctf_flagpenalty_drop"))
 		UpdateFrags(p, -cvar("g_ctf_flagpenalty_drop"));
+	PlayerScore_Add(p, SP_CTF_DROPS, +1);
 	
 	//if(e.enemy && e.enemy != e)
 	//UpdateFrags(e.enemy, cvar("g_ctf_flagscore_kill"));
diff --git a/data/qcsrc/server/scores_rules.qc b/data/qcsrc/server/scores_rules.qc
index 1d0356494..44b5470dc 100644
--- a/data/qcsrc/server/scores_rules.qc
+++ b/data/qcsrc/server/scores_rules.qc
@@ -49,8 +49,9 @@ void ScoreRules_generic()
 #define ST_CTF_CAPS 1
 #define SP_CTF_CAPS 4
 #define SP_CTF_PICKUPS 5
-#define SP_CTF_FCKILLS 6
-#define SP_CTF_RETURNS 7
+#define SP_CTF_DROPS 6
+#define SP_CTF_FCKILLS 7
+#define SP_CTF_RETURNS 8
 void ScoreRules_ctf()
 {
 	float sp_score, sp_caps;
@@ -65,6 +66,7 @@ void ScoreRules_ctf()
 			sp_score = SFL_SORT_PRIO_SECONDARY;
 			break;
 		case 2: // score only
+		case 3: // score only, no frags
 		default:
 			sp_score = SFL_SORT_PRIO_PRIMARY;
 			sp_caps = SFL_SORT_PRIO_SECONDARY; // looks better ;)
@@ -78,6 +80,7 @@ void ScoreRules_ctf()
 	ScoreInfo_SetLabel_PlayerScore(SP_CTF_PICKUPS,  "pickups",   0);
 	ScoreInfo_SetLabel_PlayerScore(SP_CTF_FCKILLS,  "fckills",   0);
 	ScoreInfo_SetLabel_PlayerScore(SP_CTF_RETURNS,  "returns",   0);
+	ScoreInfo_SetLabel_PlayerScore(SP_CTF_DROPS,    "drops",     SFL_LOWER_IS_BETTER);
 	ScoreRules_basics_end();
 }
 
-- 
2.39.2