From 158a5b120f81efb0fe94abb366a40d93033641d2 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Wed, 22 Jan 2025 22:06:14 +1000 Subject: [PATCH] Apply standard code style to sv_rules.q* --- qcsrc/common/gamemodes/sv_rules.qc | 93 +++++++++++++++--------------- qcsrc/common/gamemodes/sv_rules.qh | 12 ++-- 2 files changed, 54 insertions(+), 51 deletions(-) diff --git a/qcsrc/common/gamemodes/sv_rules.qc b/qcsrc/common/gamemodes/sv_rules.qc index d7f5006d4..03b6ce1a4 100644 --- a/qcsrc/common/gamemodes/sv_rules.qc +++ b/qcsrc/common/gamemodes/sv_rules.qc @@ -5,103 +5,106 @@ void GameRules_teams(bool value) { - if (value) { - serverflags |= SERVERFLAG_TEAMPLAY; - teamplay = 1; // aka AVAILABLE_TEAMS, updated by ScoreRules_basics() after team ents spawn - cvar_set("teamplay", "2"); // DP needs this for sending proper getstatus replies. - Team_InitTeams(); - GameRules_spawning_teams(true); - } else { - serverflags &= ~SERVERFLAG_TEAMPLAY; - teamplay = 0; - cvar_set("teamplay", "0"); // DP needs this for sending proper getstatus replies. - GameRules_spawning_teams(false); - } + if (value) + { + serverflags |= SERVERFLAG_TEAMPLAY; + teamplay = 1; // aka AVAILABLE_TEAMS, updated by ScoreRules_basics() after team ents spawn + cvar_set("teamplay", "2"); // DP needs this for sending proper getstatus replies. + Team_InitTeams(); + GameRules_spawning_teams(true); + } + else + { + serverflags &= ~SERVERFLAG_TEAMPLAY; + teamplay = 0; + cvar_set("teamplay", "0"); // DP needs this for sending proper getstatus replies. + GameRules_spawning_teams(false); + } } void GameRules_spawning_teams(bool value) { - have_team_spawns = value ? -1 : 0; + have_team_spawns = value ? -1 : 0; } bool _GameRules_score_enabled = true; void GameRules_score_enabled(bool value) { - _GameRules_score_enabled = value; + _GameRules_score_enabled = value; } bool GameRules_limit_score_initialized; void GameRules_limit_score(int limit) { - if (GameRules_limit_score_initialized) return; - if (autocvar_g_campaign) return; - if (limit < 0) return; - cvar_set("fraglimit", ftos(limit)); - GameRules_limit_score_initialized = true; + if (GameRules_limit_score_initialized) return; + if (autocvar_g_campaign) return; + if (limit < 0) return; + cvar_set("fraglimit", ftos(limit)); + GameRules_limit_score_initialized = true; } bool GameRules_limit_lead_initialized; void GameRules_limit_lead(int limit) { - if (GameRules_limit_lead_initialized) return; - if (autocvar_g_campaign) return; - if (limit < 0) return; - cvar_set("leadlimit", ftos(limit)); - GameRules_limit_lead_initialized = true; + if (GameRules_limit_lead_initialized) return; + if (autocvar_g_campaign) return; + if (limit < 0) return; + cvar_set("leadlimit", ftos(limit)); + GameRules_limit_lead_initialized = true; } bool GameRules_limit_time_initialized; void GameRules_limit_time(int limit) { - if (GameRules_limit_time_initialized) return; - if (autocvar_g_campaign) return; - if (limit < 0) return; - cvar_set("timelimit", ftos(limit)); - GameRules_limit_time_initialized = true; + if (GameRules_limit_time_initialized) return; + if (autocvar_g_campaign) return; + if (limit < 0) return; + cvar_set("timelimit", ftos(limit)); + GameRules_limit_time_initialized = true; } bool GameRules_limit_time_qualifying_initialized; void GameRules_limit_time_qualifying(int limit) { - if (GameRules_limit_time_qualifying_initialized) return; - if (autocvar_g_campaign) return; - if (limit < 0) return; - cvar_set("g_race_qualifying_timelimit", ftos(limit)); - GameRules_limit_time_qualifying_initialized = true; + if (GameRules_limit_time_qualifying_initialized) return; + if (autocvar_g_campaign) return; + if (limit < 0) return; + cvar_set("g_race_qualifying_timelimit", ftos(limit)); + GameRules_limit_time_qualifying_initialized = true; } void GameRules_limit_fallbacks() { - GameRules_limit_score(autocvar_fraglimit_override); - GameRules_limit_lead(autocvar_leadlimit_override); - GameRules_limit_time(autocvar_timelimit_override); + GameRules_limit_score(autocvar_fraglimit_override); + GameRules_limit_lead(autocvar_leadlimit_override); + GameRules_limit_time(autocvar_timelimit_override); } void _GameRules_scoring_begin(int teams, float spprio, float stprio) { - ScoreRules_basics(teams, spprio, stprio, _GameRules_score_enabled); + ScoreRules_basics(teams, spprio, stprio, _GameRules_score_enabled); } void _GameRules_scoring_field(entity i, string label, int scoreflags) { - ScoreInfo_SetLabel_PlayerScore(i, label, scoreflags); + ScoreInfo_SetLabel_PlayerScore(i, label, scoreflags); } void _GameRules_scoring_field_team(float i, string label, int scoreflags) { - ScoreInfo_SetLabel_TeamScore(i, label, scoreflags); + ScoreInfo_SetLabel_TeamScore(i, label, scoreflags); } void _GameRules_scoring_end() { - ScoreRules_basics_end(); + ScoreRules_basics_end(); } .bool m_GameRules_scoring_vip; void GameRules_scoring_vip(entity player, bool value) { - player.m_GameRules_scoring_vip = value; + player.m_GameRules_scoring_vip = value; } bool GameRules_scoring_is_vip(entity player) { - return player.m_GameRules_scoring_vip; + 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) @@ -125,9 +128,9 @@ float _GameRules_scoring_add_float2int(entity client, entity sp, float value, .f float _GameRules_scoring_add(entity client, entity sp, float value) { - return PlayerScore_Add(client, sp, 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); + return PlayerTeamScore_Add(client, sp, st, value); } diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh index 2efcf1973..6078428b6 100644 --- a/qcsrc/common/gamemodes/sv_rules.qh +++ b/qcsrc/common/gamemodes/sv_rules.qh @@ -51,12 +51,12 @@ void GameRules_limit_fallbacks(); * @param stprio team score priority (if frags aren't enabled) */ #define GameRules_scoring(teams, spprio, stprio, fields) MACRO_BEGIN \ - _GameRules_scoring_begin((teams), (spprio), (stprio)); \ - noref void(entity, string, float) field = _GameRules_scoring_field; \ - /* todo: just have the one `field` function */ \ - noref void(int, string, float) field_team = _GameRules_scoring_field_team; \ - LAMBDA(fields); \ - _GameRules_scoring_end(); \ + _GameRules_scoring_begin((teams), (spprio), (stprio)); \ + noref void(entity, string, float) field = _GameRules_scoring_field; \ + /* todo: just have the one `field` function */ \ + noref void(int, string, float) field_team = _GameRules_scoring_field_team; \ + LAMBDA(fields); \ + _GameRules_scoring_end(); \ MACRO_END void _GameRules_scoring_begin(int teams, float spprio, float stprio); -- 2.39.5