X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores.qh;h=79b65299f41e1bfa2c01d5a09e528011d5a560cd;hb=98b2c4213abe04f3ec96a95471ba5fe5fe57e008;hp=cf767659056d5f9cef2a39ae063d18a5923c8c5e;hpb=03660ddc8afa9852f26a21faaec376e0d27dcb9b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh index cf7676590..79b65299f 100644 --- a/qcsrc/server/scores.qh +++ b/qcsrc/server/scores.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include entity scores_initialized; // non-NULL when scores labels/rules have been set .float scoreboard_pos; @@ -24,6 +24,14 @@ void PlayerScore_Detach(entity player); */ float PlayerScore_Add(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. @@ -57,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. */