r3898 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-24 08:54:22 -0400 (Thu, 24 Jul 2008)
New Revision: 3898

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/keyhunt.qc
   trunk/data/qcsrc/server/scores.qc
Log:
-DCSQCSCORES for keyhunt


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-07-24 12:42:00 UTC (rev 3897)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-07-24 12:54:22 UTC (rev 3898)
@@ -1128,6 +1128,10 @@
 	if(entcs_start)
 		attach_entcs();
 
+#ifdef CSQCSCORES
+	PlayerScore_Attach(self);
+#endif
+
 	bot_relinkplayerlist();
 
 	self.spectatortime = time;
@@ -1172,6 +1176,10 @@
 
 	bot_clientdisconnect();
 
+#ifdef CSQCSCORES
+	PlayerScore_Detach(self);
+#endif
+
 	if(entcs_start)
 		detach_entcs();
 	

Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2008-07-24 12:42:00 UTC (rev 3897)
+++ trunk/data/qcsrc/server/keyhunt.qc	2008-07-24 12:54:22 UTC (rev 3898)
@@ -124,6 +124,7 @@
 // frags 0: no frags
 void kh_Scores_Event(entity player, entity key, string what, float frags_player, float frags_owner)  // update the score when a key is captured
 {
+	// FIXME rename this, remove frags_* if possible, and make it log only
 	string s;
 	if(intermission_running)
 		return;
@@ -979,6 +980,22 @@
 	setmodel(kh_controller, "");
 
 	addstat(STAT_KH_KEYS, AS_INT, kh_state);
+
+#ifdef CSQCSCORES
+	ScoreInfo_Init(kh_teams);
+	ScoreInfo_SetLabel_TeamScore  (ST_SCORE,        "score",     SFL_SORT_PRIO_PRIMARY);
+	ScoreInfo_SetLabel_TeamScore  (ST_KH_CAPS,      "caps",      SFL_SORT_PRIO_MED);
+	ScoreInfo_SetLabel_PlayerScore(SP_KILLS,        "kills",     0);
+	ScoreInfo_SetLabel_PlayerScore(SP_DEATHS,       "deaths",    SFL_DECREASING);
+	ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES,     "suicides",  SFL_DECREASING);
+	ScoreInfo_SetLabel_PlayerScore(SP_SCORE,        "score",     SFL_SORT_PRIO_PRIMARY);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_COLLECT,   "collect",   0);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_LOSEKEY,   "losekey",   SFL_DECREASING);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_CAPS,      "caps",      SFL_SORT_PRIO_HIGH);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_PUSH,      "push",      SFL_SORT_PRIO_MED);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_DESTROYED, "destroyed", SFL_SORT_PRIO_MED | SFL_DECREASING);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_KCFRAG,    "kcfrag",    SFL_SORT_PRIO_MED);
+#endif
 }
 
 void kh_finalize()

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2008-07-24 12:42:00 UTC (rev 3897)
+++ trunk/data/qcsrc/server/scores.qc	2008-07-24 12:54:22 UTC (rev 3898)
@@ -303,8 +303,8 @@
 	}
 
 	print("teamname");
-	for(i = 0; i < MAX_SCORE; ++i)
-		print(":", scores_label[i]);
+	for(i = 0; i < MAX_TEAMSCORE; ++i)
+		print(":", teamscores_label[i]);
 	print("\n");
 	for(t = 0; t < 16; ++t)
 	{