Harden player config handling

docs/custom_gravity_tests.md

@@ -0,0 +1,8 @@
+# Custom Gravity Push Coverage
+
+A manual check to ensure custom gravity values survive push interactions:
+
+1. Spawn a movable entity (e.g., a crate) and set its `gravity` to a non-default value such as `0.5`.
+2. Position the entity on top of a moving platform so it will be pushed during the simulation.
+3. Run a push movement tick and confirm the entity's `gravity` remains `0.5` after the push completes.
+4. Verify triggers along the movement path still fire for the pushed entity.

docs/intermission_flow_test.md

@@ -0,0 +1,17 @@
+# Intermission Flow Test: Scoreboard Persistence
+
+## Objective
+Confirm that deathmatch players remain on the scoreboard view throughout intermission instead of being forced back to other HUD layouts.
+
+## Preconditions
+- Start a multiplayer deathmatch session with at least one human or bot participant.
+- Reach a state where fraglimit or timelimit is close to completion so intermission can be triggered quickly.
+
+## Steps
+1. Play until the match ends naturally (or use an admin command to end the match) to enter intermission.
+2. Observe the client HUD as intermission begins.
+3. Remain idle during the entire intermission countdown without pressing the score key or toggling menus.
+
+## Expected Result
+- The scoreboard remains visible for the entire intermission without reverting to another HUD state.
+- Player input is not required to keep the scoreboard displayed during intermission.

docs/regression_tests.md

@@ -0,0 +1,12 @@
+# Regression Tests
+
+## Mover collision resolution
+- **Purpose:** Prevent movers from disappearing when collision traces reference freed or invalid entities during ground detection.
+- **Setup:**
+  - Create a simple map with a platform mover intersecting with another entity that can be removed mid-move.
+  - Instrument the mover so that a collision resolution pass occurs immediately after the other entity is freed.
+- **Steps:**
+  1. Trigger the mover so it begins translating through the space occupied by the soon-to-be-removed entity.
+  2. Remove the obstructing entity during the mover's travel to force a collision trace against an invalid reference.
+  3. Allow the mover to complete its motion.
+- **Expected result:** The mover finishes its path without being unlinked or lost from the world after the collision trace references an invalid entity.

src/bots/bot_utils.cpp

@@ -16,6 +16,7 @@ static void Player_UpdateState(gentity_t *player) {
 	const client_persistant_t &persistant = player->client->pers;
 
 	player->sv.ent_flags = SVFL_NONE;
+	player->sv.objective_state = objective_state_t::None;
 	if (player->groundentity != nullptr || (player->flags & FL_PARTIALGROUND) != 0) {
 		player->sv.ent_flags |= SVFL_ONGROUND;
 	} else {
@@ -171,6 +172,7 @@ Monster_UpdateState
 */
 static void Monster_UpdateState(gentity_t *monster) {
 	monster->sv.ent_flags = SVFL_NONE;
+	monster->sv.objective_state = objective_state_t::None;
 	if (monster->groundentity != nullptr) {
 		monster->sv.ent_flags |= SVFL_ONGROUND;
 	}
@@ -229,6 +231,7 @@ Item_UpdateState
 static void Item_UpdateState(gentity_t *item) {
 	item->sv.ent_flags = SVFL_IS_ITEM;
 	item->sv.respawntime = 0;
+	item->sv.objective_state = objective_state_t::None;
 
 	if (item->team != nullptr) {
 		item->sv.ent_flags |= SVFL_IN_TEAM;
@@ -251,7 +254,37 @@ static void Item_UpdateState(gentity_t *item) {
 	const item_id_t itemID = item->item->id;
 	if (itemID == IT_FLAG_RED || itemID == IT_FLAG_BLUE) {
 		item->sv.ent_flags |= SVFL_IS_OBJECTIVE;
-		// TODO: figure out if the objective is dropped/carried/home...
+		item->sv.team = (itemID == IT_FLAG_RED) ? TEAM_RED : TEAM_BLUE;
+
+		if (!item->sv.init) {
+			item->sv.start_origin = item->s.origin;
+		}
+
+		item->sv.end_origin = item->s.origin;
+
+		const bool isDroppedFlag = item->spawnflags.has(SPAWNFLAG_ITEM_DROPPED) || item->owner != nullptr;
+		const bool isHiddenFlag = (item->solid == SOLID_NOT) || ((item->svflags & SVF_NOCLIENT) != 0);
+		const bool isRespawning = ((item->svflags & SVF_RESPAWNING) != 0) || ((item->flags & FL_RESPAWN) != 0);
+
+		if (isDroppedFlag) {
+			item->sv.ent_flags |= SVFL_OBJECTIVE_DROPPED;
+			item->sv.objective_state = objective_state_t::Dropped;
+
+			if (item->nextthink.milliseconds() > 0) {
+				const gtime_t pendingRespawnTime = (item->nextthink - level.time);
+				item->sv.respawntime = static_cast<int32_t>(pendingRespawnTime.milliseconds());
+			}
+		} else if (isHiddenFlag && isRespawning) {
+			item->sv.ent_flags |= SVFL_OBJECTIVE_CARRIED;
+			item->sv.objective_state = objective_state_t::Carried;
+
+			if (item->sv.respawntime == 0) {
+				item->sv.respawntime = Item_UnknownRespawnTime;
+			}
+		} else {
+			item->sv.ent_flags |= SVFL_OBJECTIVE_AT_BASE;
+			item->sv.objective_state = objective_state_t::AtBase;
+		}
 	}
 
 	// always need to update these for items, since random item spawning
@@ -275,6 +308,7 @@ Trap_UpdateState
 static void Trap_UpdateState(gentity_t *danger) {
 	danger->sv.ent_flags = SVFL_TRAP_DANGER;
 	danger->sv.velocity = danger->velocity;
+	danger->sv.objective_state = objective_state_t::None;
 
 	if (danger->owner != nullptr && danger->owner->client != nullptr) {
 		player_skinnum_t pl_skinnum;
@@ -314,6 +348,7 @@ Mover_UpdateState
 static void Mover_UpdateState(gentity_t *entity) {
 	entity->sv.ent_flags = SVFL_NONE;
 	entity->sv.health = entity->health;
+	entity->sv.objective_state = objective_state_t::None;
 
 	if (entity->takedamage) {
 		entity->sv.ent_flags |= SVFL_TAKES_DAMAGE;

src/cg_screen.cpp

@@ -112,14 +112,29 @@ void CG_ClearNotify(int32_t isplit) {
 
 // if the top one is expired, cycle the ones ahead backwards (since
 // the times are always increasing)
+/*
+=============
+CG_Notify_CheckExpire
+
+Expire stale notify entries with bounded swapping to prevent corrupted times
+from triggering excessive iterations.
+=============
+*/
 static void CG_Notify_CheckExpire(hud_data_t &data) {
-	while (data.notify[0].is_active && data.notify[0].time < cgi.CL_ClientTime()) {
+	size_t iterations = 0;
+
+	while (data.notify[0].is_active && data.notify[0].time < cgi.CL_ClientTime() && iterations < MAX_NOTIFY) {
 		data.notify[0].is_active = false;
 
 		for (size_t i = 1; i < MAX_NOTIFY; i++)
 			if (data.notify[i].is_active)
 				std::swap(data.notify[i], data.notify[i - 1]);
+
+		iterations++;
 	}
+
+	if (iterations >= MAX_NOTIFY && data.notify[0].is_active && data.notify[0].time < cgi.CL_ClientTime())
+		data.notify[0].is_active = false;
 }
 
 // add notify to list
@@ -694,11 +709,14 @@ static void CG_DrawTable(int x, int y, uint32_t width, uint32_t height, int32_t
 }
 
 /*
-=================
+=============
 CG_TimeStringMs
-=================
+
+Format a client-visible timer string with millisecond precision.
+=============
 */
 static const char *CG_TimeStringMs(const int msec) {
+	static char buffer[32];
 	int hours, mins, seconds, ms = msec;
 
 	seconds = ms / 1000;
@@ -709,10 +727,12 @@ static const char *CG_TimeStringMs(const int msec) {
 	mins -= hours * 60;
 
 	if (hours > 0) {
-		return G_Fmt("{}:{:02}:{:02}.{}", hours, mins, seconds, ms).data();
+		G_FmtTo(buffer, "{}:{:02}:{:02}.{}", hours, mins, seconds, ms);
 	} else {
-		return G_Fmt("{:02}:{:02}.{}", mins, seconds, ms).data();
+		G_FmtTo(buffer, "{:02}:{:02}.{}", mins, seconds, ms);
 	}
+
+	return buffer;
 }
 
 /*