Merge branch 'bones_was_here/q3compat' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / scores.qh

diff --git a/qcsrc/common/scores.qh b/qcsrc/common/scores.qh
index 377a780770300554275d3685e3e6d53e90122bb8..cf50a7fd12ee0ebadbe177ecdea804d84e518a40 100644 (file)
--- a/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@ -4,10 +4,11 @@
 
 #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); }
 
 /*
@@ -16,16 +17,20 @@ STATIC_INIT(Scores_renumber) { FOREACH(Scores, true, it.m_id = i); }
 
 // 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);
@@ -35,7 +40,6 @@ REGISTER_SP(KILLS);
 REGISTER_SP(DEATHS);
 REGISTER_SP(SUICIDES);
 REGISTER_SP(TEAMKILLS);
-REGISTER_SP(FRAGS);
 
 REGISTER_SP(ELO);