Skip to content

Clamp domination tick interval and log clamping #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
themuffinator wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clamp domination tick interval and log clamping #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/server/gameplay/g_domination.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ extern const spawn_temp_t& ED_GetSpawnTemp();

namespace {
constexpr GameTime kDominationMinScoreInterval = 100_ms;
constexpr GameTime kDominationMaxScoreInterval = GameTime::from_sec(10.0f);
constexpr float kDominationDefaultTickIntervalSeconds = 1.0f;
constexpr int32_t kDominationDefaultPointsPerTick = 1;
constexpr float kDominationDefaultCaptureSeconds = 3.0f;
Expand All @@ -31,8 +32,18 @@ namespace {
}

GameTime interval = GameTime::from_sec(seconds);
if (!interval || interval < kDominationMinScoreInterval)
if (!interval || interval < kDominationMinScoreInterval) {
gi.Com_PrintFmt(
"Domination: clamping g_domination_tick_interval to minimum of {} ms (requested {} seconds).\n",
kDominationMinScoreInterval.milliseconds(), seconds);
interval = kDominationMinScoreInterval;
}
else if (interval > kDominationMaxScoreInterval) {
gi.Com_PrintFmt(
"Domination: clamping g_domination_tick_interval to maximum of {} ms (requested {} seconds).\n",
kDominationMaxScoreInterval.milliseconds(), seconds);
interval = kDominationMaxScoreInterval;
}

return interval;
}
Expand Down
164 changes: 155 additions & 9 deletions tests/test_gametype_domination.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <random>
#include <cstring>
#include <type_traits>
#include <string>
#include <vector>

namespace std {
using ::sinf;
Expand All @@ -18,21 +20,104 @@ namespace std {

#include <cassert>

static void TestComPrint(const char*) {}
static std::vector<std::string> g_comPrintMessages{};

/*
=============
TestComPrint

Captures server print output for assertions.
=============
*/
static void TestComPrint(const char* message) {
g_comPrintMessages.emplace_back(message ? message : "");
}

/*
=============
TestBroadcast
=============
*/
static void TestBroadcast(print_type_t, const char*) {}

/*
=============
TestClientPrint
=============
*/
static void TestClientPrint(gentity_t*, print_type_t, const char*) {}

/*
=============
TestCenterPrint
=============
*/
static void TestCenterPrint(gentity_t*, const char*) {}

/*
=============
TestSound
=============
*/
static void TestSound(gentity_t*, soundchan_t, int, float, float, float) {}

/*
=============
TestPositionedSound
=============
*/
static void TestPositionedSound(const Vector3&, gentity_t*, soundchan_t, int, float, float, float) {}

/*
=============
TestSoundIndex
=============
*/
static int TestSoundIndex(const char*) { return 0; }

/*
=============
TestLink
=============
*/
static void TestLink(gentity_t*) {}

/*
=============
TestUnlink
=============
*/
static void TestUnlink(gentity_t*) {}

/*
=============
TestBotUnregister
=============
*/
static void TestBotUnregister(const gentity_t*) {}

/*
=============
TestComError
=============
*/
static void TestComError(const char*) { assert(false && "Com_Error called"); }

/*
=============
TestLocPrint
=============
*/
static void TestLocPrint(gentity_t*, print_type_t, const char*, const char**, size_t) {}

/*
=============
TestTrace
=============
*/
static trace_t TestTrace(const Vector3&, const Vector3&, const Vector3&, const Vector3&, const gentity_t*, contents_t) {
race_t tr{};
return tr;
trace_t tr{};
return tr;
}

game_export_t globals{};
Expand Down Expand Up @@ -80,32 +165,67 @@ cvar_t* g_domination_points_per_tick = &g_domination_points_per_tick_storage;
static cvar_t g_domination_capture_time_storage{};
cvar_t* g_domination_capture_time = &g_domination_capture_time_storage;

/*
=============
ScoringIsDisabled
=============
*/
bool ScoringIsDisabled() {
return level.matchState != MatchState::In_Progress;
return level.matchState != MatchState::In_Progress;
}

/*
=============
G_AdjustTeamScore
=============
*/
void G_AdjustTeamScore(Team team, int32_t offset) {
if (team == Team::Red || team == Team::Blue)
level.teamScores[static_cast<int>(team)] += offset;
level.teamScores[static_cast<int>(team)] += offset;
}

/*
=============
ClientIsPlaying
=============
*/
bool ClientIsPlaying(gclient_t*) {
return true;
}

/*
=============
Spawn
=============
*/
gentity_t* Spawn() {
static std::aligned_storage_t<sizeof(gentity_t), alignof(gentity_t)> storage;
auto* ent = reinterpret_cast<gentity_t*>(&storage);
std::memset(ent, 0, sizeof(gentity_t));
return ent;
static std::aligned_storage_t<sizeof(gentity_t), alignof(gentity_t)> storage;
auto* ent = reinterpret_cast<gentity_t*>(&storage);
std::memset(ent, 0, sizeof(gentity_t));
return ent;
}

/*
=============
FreeEntity
=============
*/
void FreeEntity(gentity_t*) {}

/*
=============
Teams
=============
*/
bool Teams() {
return Game::Has(GameFlags::Teams);
}

/*
=============
Teams_TeamName
=============
*/
const char* Teams_TeamName(Team team) {
switch (team) {
case Team::Red:
Expand All @@ -117,13 +237,23 @@ const char* Teams_TeamName(Team team) {
}
}

/*
=============
ED_GetSpawnTemp
=============
*/
const spawn_temp_t& ED_GetSpawnTemp() {
static spawn_temp_t temp{};
return temp;
}

#include "server/gameplay/g_domination.cpp"

/*
=============
main
=============
*/
int main() {
const auto& info = Game::GetInfo(GameType::Domination);
assert(info.type == GameType::Domination);
Expand Down Expand Up @@ -157,6 +287,22 @@ int main() {
gi.trace = TestTrace;
gi.frameTimeMs = 100;

g_comPrintMessages.clear();
g_domination_tick_interval_storage.value = -1.0f;
g_domination_tick_interval_storage.integer = -1;
const GameTime minimumInterval = DominationTickInterval();
assert(minimumInterval == kDominationMinScoreInterval);
assert(!g_comPrintMessages.empty());
Comment on lines +291 to +295
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Minimum interval test asserts unreachable clamp

The new minimum clamp assertions will always fail: DominationTickInterval() only uses g_domination_tick_interval when its value is positive (lines 26–32 of g_domination.cpp), so setting the cvar to -1 falls back to the 1 s default and never hits the minimum clamp/log path. The expectations here that the interval equals kDominationMinScoreInterval and that a "minimum" log was emitted are therefore unreachable, breaking this test every run.

Useful? React with 👍 / 👎.

assert(g_comPrintMessages.back().find("minimum") != std::string::npos);

g_comPrintMessages.clear();
g_domination_tick_interval_storage.value = 50.0f;
g_domination_tick_interval_storage.integer = 50;
const GameTime maximumInterval = DominationTickInterval();
assert(maximumInterval == kDominationMaxScoreInterval);
assert(!g_comPrintMessages.empty());
assert(g_comPrintMessages.back().find("maximum") != std::string::npos);

deathmatchVar.integer = 0;
deathmatchVar.value = 0.0f;
fragLimitVar.integer = 0;
Expand Down