X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores.qh;h=2287815f5acd2e43fc8c7b24d443344a83b28040;hb=abb6ce49a3c967f71dd8d99a80968e68587a39b3;hp=2f9c0787239dbff7d6b7452e840b3de17b2e3860;hpb=acddeee8ad8acd0099fdd25d5049e302d6246f24;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index 2f9c07872..2287815f5 100644
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <common/constants.qh>
+#include <common/scores.qh>
+
+bool autocvar_g_full_getstatus_responses;
 
 entity scores_initialized; // non-NULL when scores labels/rules have been set
 .float scoreboard_pos;
@@ -24,6 +26,14 @@ void PlayerScore_Detach(entity player);
  */
 float PlayerScore_Add(entity player, PlayerScoreField scorefield, float score);
 
+/**
+ * Sets the player's score to the score parameter.
+ * NEVER call this if PlayerScore_Attach has not been called yet!
+ * Means: FIXME make players unable to join the game when not called ClientConnect yet.
+ * Returns the new (or old if unchanged) score.
+ */
+float PlayerScore_Set(entity player, PlayerScoreField scorefield, float score);
+
 /**
  * \brief Returns the player's score.
  * \param[in] player Player to inspect.
@@ -52,7 +62,7 @@ float TeamScore_Add(entity player, float scorefield, float score);
  * NEVER call this if team has not been set yet!
  * Returns the new score.
  */
-float TeamScore_AddToTeam(float t, float scorefield, float score);
+float TeamScore_AddToTeam(int t, float scorefield, float score);
 
 /**
  * Returns a value indicating the team score (and higher is better).
@@ -65,11 +75,6 @@ float TeamScore_GetCompareValue(float t);
  */
 float PlayerTeamScore_Add(entity player, PlayerScoreField pscorefield, float tscorefield, float score);
 
-/**
- * Adds to the generic score fields for both the player and the team.
- */
-#define PlayerTeamScore_AddScore(p, s) PlayerTeamScore_Add(p, SP_SCORE, ST_SCORE, s)
-
 /**
  * Set the label of a team score item, as well as the scoring flags.
  */
@@ -133,4 +138,4 @@ string GetTeamScoreString(float tm, float shortString);
  * strict: return a strict ordering
  * nospectators: exclude spectators
  */
-entity PlayerScore_Sort(.float field, float teams, float strict, float nospectators);
+entity PlayerScore_Sort(.float field, int teams, bool strict, bool nospectators);