Merge branch 'master' into Mario/entrap_nade

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

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index ff0555cad6cf4d24a27dc9089a327d45dc9bed97..a462bde92c4bed31f706262a2314b43a5c3ff8f0 100644 (file)
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,7 +1,8 @@
-#ifndef SCORES_H
-#define SCORES_H
+#pragma once
 
-entity scores_initialized; // non-world when scores labels/rules have been set
+#include <common/constants.qh>
+
+entity scores_initialized; // non-NULL when scores labels/rules have been set
 .float scores[MAX_SCORE];
 .float teamscores[MAX_TEAMSCORE];
 .float scoreboard_pos;
@@ -92,21 +93,21 @@ void Score_NicePrint(entity to);
 /**
  * Sets the following results for the current scores entities.
  */
-void WinningConditionHelper();
+void WinningConditionHelper(entity this);
 float WinningConditionHelper_topscore;      ///< highest score
 float WinningConditionHelper_secondscore;   ///< second highest score
 float WinningConditionHelper_winnerteam;    ///< the color of the winning team, or -1 if none
 float WinningConditionHelper_secondteam;    ///< the color of the second team, or -1 if none
 float WinningConditionHelper_equality;      ///< we have no winner
-entity WinningConditionHelper_winner;       ///< the winning player, or world if none
-entity WinningConditionHelper_second;       ///< the second player, or world if none
+entity WinningConditionHelper_winner;       ///< the winning player, or NULL if none
+entity WinningConditionHelper_second;       ///< the second player, or NULL if none
 float WinningConditionHelper_lowerisbetter; ///< lower is better, duh
 float WinningConditionHelper_zeroisworst;   ///< zero is worst, duh
 #define WINNINGCONDITIONHELPER_LOWERISBETTER_WORST 999999999
 
 /**
  * Returns score strings for eventlog etc.
- * When called with world, or 0, as argument, they return the labels in the
+ * When called with NULL, or 0, as argument, they return the labels in the
  * same order.
  * The strings are comma separated; labels that end with !! designate primary,
  * labels that end with ! designate high priority.
@@ -127,4 +128,3 @@ string GetTeamScoreString(float tm, float shortString);
  * nospectators: exclude spectators
  */
 entity PlayerScore_Sort(.float field, float teams, float strict, float nospectators);
-#endif