From: terencehill <piuntn@gmail.com>
Date: Wed, 7 Aug 2024 22:18:15 +0000 (+0200)
Subject: CTF: fix waypoint healthbar not shown if g_ctf_flag_return_damage is enabled and... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8fda401c5562ce5183a1bf58425e95221ff2c6e;p=xonotic%2Fxonotic-data.pk3dir.git

CTF: fix waypoint healthbar not shown if g_ctf_flag_return_damage is enabled and g_ctf_flag_health is 0
---

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index d20aed535..7ae8db860 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -827,7 +827,7 @@ void ctf_CheckFlagReturn(entity flag, int returntype)
 	if((flag.ctf_status == FLAG_DROPPED) || (flag.ctf_status == FLAG_PASSING))
 	{
 		if (flag.wps_flagdropped
-		&& (autocvar_g_ctf_flag_return_time || (autocvar_g_ctf_flag_return_damage && autocvar_g_ctf_flag_health)))
+		&& (autocvar_g_ctf_flag_return_time || autocvar_g_ctf_flag_return_damage))
 		{
 			WaypointSprite_UpdateHealth(flag.wps_flagdropped, GetResource(flag, RES_HEALTH));
 		}