Merge branch 'master' into martin-t/globals

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

diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh
index ca1b6f8e74649e80c2b1ebe8c180871c00cef75e..1b0f8a7bd89128fccc844f0fc05ccdf243608b91 100644 (file)
--- a/qcsrc/common/gamemodes/sv_rules.qh
+++ b/qcsrc/common/gamemodes/sv_rules.qh
@@ -1,7 +1,7 @@
 #pragma once
 
 // TODO: find a better location for these?
-float total_players;
+int total_players;
 
 // todo: accept the number of teams as a parameter
 void GameRules_teams(bool value);
@@ -31,14 +31,14 @@ void GameRules_limit_fallbacks();
  * @param spprio player score priority (if frags aren't enabled)
  * @param stprio team score priority (if frags aren't enabled)
  */
-#define GameRules_scoring(teams, spprio, stprio, fields) MACRO_BEGIN { \
+#define GameRules_scoring(teams, spprio, stprio, fields) MACRO_BEGIN \
     _GameRules_scoring_begin((teams), (spprio), (stprio)); \
     noref void(entity, string, float) field = _GameRules_scoring_field; \
     /* todo: just have the one `field` function */ \
     noref void(int, string, float) field_team = _GameRules_scoring_field_team; \
     LAMBDA(fields); \
     _GameRules_scoring_end(); \
-} MACRO_END
+MACRO_END
 
 void _GameRules_scoring_begin(int teams, float spprio, float stprio);
 void _GameRules_scoring_field(entity i, string label, int scoreflags);