Store the current gametype as a shortname rather than registry ID, fixes some issues...

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

diff --git a/qcsrc/common/scores.qh b/qcsrc/common/scores.qh
index 0451fd9c2e30fd02f910c5b576ae58d4bb97bd98..3bc6c55636c65fa4e3875d0bf2b328e0f3a0aa02 100644 (file)
--- a/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@ -4,16 +4,18 @@
 
 #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
 REGISTER_SP(END);
 
@@ -33,10 +35,13 @@ REGISTER_SP(DMGTAKEN);
 REGISTER_SP(KILLS);
 REGISTER_SP(DEATHS);
 REGISTER_SP(SUICIDES);
+REGISTER_SP(TEAMKILLS);
 REGISTER_SP(FRAGS);
 
 REGISTER_SP(ELO);
 
+REGISTER_SP(FPS);
+
 // TODO: move to common mutators
 
 REGISTER_SP(RACE_TIME);