Merge branch 'master' into Mario/target_teleporter_v2

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

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index 60de66904bf66f1513b051906279664b43868a3f..79b65299f41e1bfa2c01d5a09e528011d5a560cd 100644 (file)
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/constants.qh>
+#include <common/scores.qh>
 
 entity scores_initialized; // non-NULL when scores labels/rules have been set
 .float scoreboard_pos;
@@ -30,7 +30,7 @@ float PlayerScore_Add(entity player, PlayerScoreField scorefield, float score);
  * \param[in] scorefield Field of the score.
  * \return Player's score.
  */
-float PlayerScore_Get(entity player, PlayerScoreField scorefield);
+#define PlayerScore_Get(player, scorefield) PlayerScore_Add(player, scorefield, 0)
 
 /**
  * Initialize the score of this player if needed.
@@ -65,11 +65,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.
  */