scoring: remove some redundant/trivial funcs

Some of these look like someone bikeshedded the names but didn't finish
the job, we don't need funcs for that.

diff --git a/qcsrc/common/gamemodes/sv_rules.qc b/qcsrc/common/gamemodes/sv_rules.qc
index f582f82cbef1289d2344613ffeddc95b7a6cd202..7ffc8a00c5c0752ef633a656e169624e4a3fd77d 100644 (file)
--- a/qcsrc/common/gamemodes/sv_rules.qc
+++ b/qcsrc/common/gamemodes/sv_rules.qc
@@ -1,8 +1,5 @@
 #include "sv_rules.qh"
 
-#include <server/spawnpoints.qh>
-#include <server/teamplay.qh>
-
 void GameRules_teams(bool value)
 {
        if (value)
@@ -22,17 +19,6 @@ void GameRules_teams(bool value)
        }
 }
 
-void GameRules_spawning_teams(bool value)
-{
-       have_team_spawns = value ? -1 : 0;
-}
-
-bool _GameRules_score_enabled = true;
-void GameRules_score_enabled(bool value)
-{
-       _GameRules_score_enabled = value;
-}
-
 bool GameRules_limit_score_initialized;
 void GameRules_limit_score(int limit)
 {
@@ -80,33 +66,6 @@ void GameRules_limit_fallbacks()
        GameRules_limit_time(autocvar_timelimit_override);
 }
 
-void _GameRules_scoring_begin(int teams, float spprio, float stprio)
-{
-       ScoreRules_basics(teams, spprio, stprio, _GameRules_score_enabled);
-}
-void _GameRules_scoring_field(entity i, string label, int scoreflags)
-{
-       ScoreInfo_SetLabel_PlayerScore(i, label, scoreflags);
-}
-void _GameRules_scoring_field_team(float i, string label, int scoreflags)
-{
-       ScoreInfo_SetLabel_TeamScore(i, label, scoreflags);
-}
-void _GameRules_scoring_end()
-{
-       ScoreRules_basics_end();
-}
-
-.bool m_GameRules_scoring_vip;
-void GameRules_scoring_vip(entity player, bool value)
-{
-       player.m_GameRules_scoring_vip = value;
-}
-bool GameRules_scoring_is_vip(entity player)
-{
-       return player.m_GameRules_scoring_vip;
-}
-
 /// Uses client.(float_field) to accumulate and consume float score and adds score to the player as int (rounded)
 /// only when at least one unit of score has been accumulated. It works with negative score too
 /// Float scores can't be used as score because they aren't supported by the QC score networking system
@@ -125,12 +84,3 @@ float _GameRules_scoring_add_float2int(entity client, entity sp, int st, float v
        client.(float_field) -= points * score_factor;
        return team ? PlayerTeamScore_Add(client, sp, st, points) : PlayerScore_Add(client, sp, points);
 }
-
-float _GameRules_scoring_add(entity client, entity sp, float value)
-{
-       return PlayerScore_Add(client, sp, value);
-}
-float _GameRules_scoring_add_team(entity client, entity sp, int st, float value)
-{
-       return PlayerTeamScore_Add(client, sp, st, value);
-}

diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh
index 1cb6a83906b61c5a21f196d0180f919401f640b4..eba49ba55a146f845858edbfeea0bbbdfeccd693 100644 (file)
--- a/qcsrc/common/gamemodes/sv_rules.qh
+++ b/qcsrc/common/gamemodes/sv_rules.qh
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <server/spawnpoints.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
+
 //int autocvar_leadlimit;
 int autocvar_leadlimit_and_fraglimit;
 int autocvar_leadlimit_override;
@@ -28,12 +32,13 @@ void GameRules_teams(bool value);
 /**
  * Used to disable team spawns in team modes
  */
-void GameRules_spawning_teams(bool value);
+#define GameRules_spawning_teams(value) have_team_spawns = (value) ? -1 : 0
 
 /**
  * Disabling score disables the "score" column on the scoreboard
  */
-void GameRules_score_enabled(bool value);
+bool _GameRules_score_enabled = true;
+#define GameRules_score_enabled(value) _GameRules_score_enabled = (value)
 
 void GameRules_limit_score(int limit);
 void GameRules_limit_lead(int limit);
@@ -59,25 +64,26 @@ void GameRules_limit_fallbacks();
        _GameRules_scoring_end(); \
 MACRO_END
 
-void _GameRules_scoring_begin(int teams, float spprio, float stprio);
-void _GameRules_scoring_field(entity i, string label, int scoreflags);
-void _GameRules_scoring_field_team(float i, string label, int scoreflags);
-void _GameRules_scoring_end();
+#define _GameRules_scoring_begin(teams, spprio, stprio) ScoreRules_basics(teams, spprio, stprio, _GameRules_score_enabled)
+#define _GameRules_scoring_field       ScoreInfo_SetLabel_PlayerScore
+#define _GameRules_scoring_field_team  ScoreInfo_SetLabel_TeamScore
+#define _GameRules_scoring_end         ScoreRules_basics_end
 
 /**
  * Mark a player as being 'important' (flag carrier, ball carrier, etc)
  * @param player the entity to mark
  * @param value VIP status
  */
-void GameRules_scoring_vip(entity player, bool value);
-bool GameRules_scoring_is_vip(entity player);
+.bool m_GameRules_scoring_vip;
+#define GameRules_scoring_vip(player, value) (player).m_GameRules_scoring_vip = (value)
+#define GameRules_scoring_is_vip(player)     (player).m_GameRules_scoring_vip
+
+float _GameRules_scoring_add_float2int(entity client, entity sp, int st, float value, .float float_field, float score_factor, bool team);
 
 #define GameRules_scoring_add_float2int(client, fld, value, float_field, score_factor) \
        _GameRules_scoring_add_float2int(client, SP_##fld, 0, value, float_field, score_factor, false)
-float _GameRules_scoring_add_float2int(entity client, entity sp, int st, float value, .float float_field, float score_factor, bool team);
-#define GameRules_scoring_add(client, fld, value) _GameRules_scoring_add(client, SP_##fld, value)
-float _GameRules_scoring_add(entity client, entity sp, float value);
+#define GameRules_scoring_add(client, fld, value) PlayerScore_Add(client, SP_##fld, value)
+
 #define GameRules_scoring_add_team_float2int(client, fld, value, float_field, score_factor) \
        _GameRules_scoring_add_float2int(client, SP_##fld, ST_##fld, value, float_field, score_factor, true)
-#define GameRules_scoring_add_team(client, fld, value) _GameRules_scoring_add_team(client, SP_##fld, ST_##fld, value)
-float _GameRules_scoring_add_team(entity client, entity sp, int st, float value);
+#define GameRules_scoring_add_team(client, fld, value) PlayerTeamScore_Add(client, SP_##fld, ST_##fld, value)