X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fscores.qh;h=45af93992aacdf33f7d8338867fe73a43807b2a3;hb=74ab8f6ab3ac4b44608a6c61cd0393202fd8fb4a;hp=646638a80ca704778f8628513a6225021c154566;hpb=fdbfb6f9364d8aeae67e108400a6bd1dd37dc0b7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/scores.qh b/qcsrc/common/scores.qh
index 646638a80..45af93992 100644
--- a/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@ -4,28 +4,32 @@
 
 #define REGISTER_SP(id) REGISTER(Scores, SP, id, m_id, new_pure(PlayerScoreField))
 REGISTRY(Scores, MAX_SCORE);
-#define Scores_from(i) _Scores_from(i, NULL)
 REGISTER_REGISTRY(Scores)
 REGISTRY_SORT(Scores);
 REGISTRY_CHECK(Scores);
+
+REGISTRY_DEFINE_GET(Scores, NULL)
 STATIC_INIT(Scores_renumber) { FOREACH(Scores, true, it.m_id = i); }
 
 /*
  * Score indices
  */
 
-// game mode specific indices are not in common/, but in server/scores_rules.qc!
 #ifdef GAMEQC
+// fields not networked via the score system
 REGISTER_SP(END);
 
 REGISTER_SP(PING);
 REGISTER_SP(PL);
 REGISTER_SP(NAME);
-REGISTER_SP(KDRATIO);
-REGISTER_SP(SUM);
-
 REGISTER_SP(SEPARATOR);
 
+REGISTER_SP(KDRATIO); // kills / deaths
+REGISTER_SP(SUM); // kills - deaths
+REGISTER_SP(FRAGS); // kills - suicides
+
+// networked fields
+
 REGISTER_SP(SCORE);
 
 REGISTER_SP(DMG);
@@ -34,10 +38,12 @@ REGISTER_SP(DMGTAKEN);
 REGISTER_SP(KILLS);
 REGISTER_SP(DEATHS);
 REGISTER_SP(SUICIDES);
-REGISTER_SP(FRAGS);
+REGISTER_SP(TEAMKILLS);
 
 REGISTER_SP(ELO);
 
+REGISTER_SP(FPS);
+
 // TODO: move to common mutators
 
 REGISTER_SP(RACE_TIME);