Merge branch 'master' into Mario/wepent_experimental

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index e6e5596939dc38b5f7269af128c87fe4d0820ace..29f96aa4490b527ecab33592689534fb358c16ec 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -1,5 +1,4 @@
-#ifndef CONSTANTS_H
-#define CONSTANTS_H
+#pragma once
 
 REGISTER_NET_TEMP(TE_CSQC_PICTURE)
 REGISTER_NET_TEMP(TE_CSQC_RACE)
@@ -127,7 +126,7 @@ const int SFL_SORT_PRIO_MASK = 12;
  * Score indices
  */
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 #define IS_INCREASING(x) ( (x) & SFL_LOWER_IS_BETTER )
 #define IS_DECREASING(x) ( !((x) & SFL_LOWER_IS_BETTER) )
@@ -155,10 +154,9 @@ USING(PlayerScoreField, entity);
 REGISTER_SP(END);
 
 REGISTER_SP(PING);
+REGISTER_SP(PL);
 REGISTER_SP(NAME);
 REGISTER_SP(KDRATIO);
-REGISTER_SP(CLRATIO);
-REGISTER_SP(PL);
 REGISTER_SP(SUM);
 
 REGISTER_SP(SEPARATOR);
@@ -181,9 +179,9 @@ REGISTER_SP(RACE_TIME);
 REGISTER_SP(RACE_LAPS);
 REGISTER_SP(RACE_FASTEST);
 
-REGISTER_SP(CTS_TIME);
-REGISTER_SP(CTS_LAPS);
-REGISTER_SP(CTS_FASTEST);
+//REGISTER_SP(CTS_TIME);
+//REGISTER_SP(CTS_LAPS);
+//REGISTER_SP(CTS_FASTEST);
 
 REGISTER_SP(ASSAULT_OBJECTIVES);
 
@@ -326,4 +324,3 @@ const int SPAWN_PRIO_GOOD_DISTANCE = 10;
 const int GTV_FORBIDDEN = 0; // Cannot be voted
 const int GTV_AVAILABLE = 1; // Can be voted
 const int GTV_CUSTOM    = 2; // Custom entry
-#endif