X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores.qh;h=2b6ea4881045808340260607aaabd596032a6a5f;hb=17fd0adc9434cde385b78d09196aed727b24b9c4;hp=cf767659056d5f9cef2a39ae063d18a5923c8c5e;hpb=34e7f534e2015466228eb3a78c9857741b736dca;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index cf7676590..2b6ea4881 100644
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,9 +1,10 @@
 #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;
 
 /**
  * Attaches a PlayerScore entity to a player. Use that in ClientConnect.
@@ -24,6 +25,22 @@ 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.
+ * \param[in] scorefield Field of the score.
+ * \return Player's score.
+ */
+#define PlayerScore_Get(player, scorefield) PlayerScore_Add(player, scorefield, 0)
+
 /**
  * Initialize the score of this player if needed.
  * Does nothing in teamplay.
@@ -44,7 +61,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).
@@ -57,11 +74,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.
  */
@@ -76,7 +88,7 @@ void ScoreInfo_SetLabel_PlayerScore(PlayerScoreField i, string label, float scor
  * Initialize the scores info for the given number of teams.
  * Set all labels right before this call.
  */
-void ScoreInfo_Init(float teams);
+void ScoreInfo_Init(int teams);
 
 /**
  * Clear ALL scores (for ready-restart).
@@ -125,4 +137,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);