-#ifndef SCORES_H
-#define SCORES_H
-
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
- #include "../common/util-pre.qh"
- #include "sys-pre.qh"
- #include "../dpdefs/progsdefs.qc"
- #include "../dpdefs/dpextensions.qc"
- #include "sys-post.qh"
- #include "../warpzonelib/anglestransform.qh"
- #include "../warpzonelib/mathlib.qh"
- #include "../warpzonelib/common.qh"
- #include "../warpzonelib/util_server.qh"
- #include "../warpzonelib/server.qh"
- #include "../common/constants.qh"
- #include "../common/stats.qh"
- #include "../common/teams.qh"
- #include "../common/util.qh"
- #include "../common/nades.qh"
- #include "../common/buffs.qh"
- #include "../common/test.qh"
- #include "../common/counting.qh"
- #include "../common/urllib.qh"
- #include "../common/command/markup.qh"
- #include "../common/command/rpn.qh"
- #include "../common/command/generic.qh"
- #include "../common/command/shared_defs.qh"
- #include "../common/net_notice.qh"
- #include "../common/animdecide.qh"
- #include "../common/monsters/monsters.qh"
- #include "../common/monsters/sv_monsters.qh"
- #include "../common/monsters/spawn.qh"
- #include "../common/weapons/config.qh"
- #include "../common/weapons/weapons.qh"
- #include "weapons/accuracy.qh"
- #include "weapons/common.qh"
- #include "weapons/csqcprojectile.qh"
- #include "weapons/hitplot.qh"
- #include "weapons/selection.qh"
- #include "weapons/spawning.qh"
- #include "weapons/throwing.qh"
- #include "weapons/tracing.qh"
- #include "weapons/weaponstats.qh"
- #include "weapons/weaponsystem.qh"
- #include "t_items.qh"
- #include "autocvars.qh"
- #include "constants.qh"
- #include "defs.qh"
- #include "../common/notifications.qh"
- #include "../common/deathtypes.qh"
- #include "mutators/mutators_include.qh"
- #include "tturrets/include/turrets_early.qh"
- #include "vehicles/vehicles_def.qh"
- #include "campaign.qh"
- #include "../common/campaign_common.qh"
- #include "../common/mapinfo.qh"
- #include "command/common.qh"
- #include "command/banning.qh"
- #include "command/radarmap.qh"
- #include "command/vote.qh"
- #include "command/getreplies.qh"
- #include "command/cmd.qh"
- #include "command/sv_cmd.qh"
- #include "../common/csqcmodel_settings.qh"
- #include "../csqcmodellib/common.qh"
- #include "../csqcmodellib/sv_model.qh"
- #include "anticheat.qh"
- #include "cheats.qh"
- #include "../common/playerstats.qh"
- #include "portals.qh"
- #include "g_hook.qh"
-#endif
-
-entity scores_initialized; // non-world when scores labels/rules have been set
-.float scores[MAX_SCORE];
-.float teamscores[MAX_TEAMSCORE];
+#pragma once
+
+#include <common/scores.qh>
+
+entity scores_initialized; // non-NULL when scores labels/rules have been set
.float scoreboard_pos;
/**
* Means: FIXME make players unable to join the game when not called ClientConnect yet.
* Returns the new score.
*/
-float PlayerScore_Add(entity player, float scorefield, float score);
+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.
* Adds a score to both the player and the team. Returns the team score if
* possible, otherwise the player score.
*/
-float PlayerTeamScore_Add(entity player, float 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)
+float PlayerTeamScore_Add(entity player, PlayerScoreField pscorefield, float tscorefield, float score);
/**
* Set the label of a team score item, as well as the scoring flags.
/**
* Set the label of a player score item, as well as the scoring flags.
*/
-void ScoreInfo_SetLabel_PlayerScore(float i, string label, float scoreflags);
+void ScoreInfo_SetLabel_PlayerScore(PlayerScoreField i, string label, float scoreflags);
/**
* Initialize the scores info for the given number of teams.
/**
* 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.
* nospectators: exclude spectators
*/
entity PlayerScore_Sort(.float field, float teams, float strict, float nospectators);
-#endif
\ No newline at end of file
projects / xonotic / xonotic-data.pk3dir.git / blobdiff