From: Samual Lenks <samual@xonotic.org>
Date: Mon, 10 Sep 2012 06:10:59 +0000 (-0400)
Subject: Update the help me ping a bit to be more useful
X-Git-Tag: xonotic-v0.7.0~240^2~12
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=3ece3fd9dd085d2f39863e66c7bab51a7b01e16a;p=xonotic%2Fxonotic-data.pk3dir.git

Update the help me ping a bit to be more useful
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 22a09e568..f5c9acdf7 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -174,7 +174,7 @@ set g_ctf_flag_return_time 15
 set g_ctf_flag_return_dropped 100
 set g_ctf_flag_return_damage 0
 set g_ctf_flag_return_when_unreachable 1 "automatically return the flag if it falls into lava/slime/trigger hurt"
-set g_ctf_flagcarrier_auto_helpme_when_damaged 50
+set g_ctf_flagcarrier_auto_helpme_when_damaged 100
 set g_ctf_flagcarrier_allow_vehicle_carry 1 
 set g_ctf_flagcarrier_selfdamagefactor 1
 set g_ctf_flagcarrier_selfforcefactor 1
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index cf28dc168..ad047a221 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -1040,7 +1040,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerDamage) // for changing damage and force values t
 	else if(frag_target.flagcarried && (frag_target.deadflag == DEAD_NO) && IsDifferentTeam(frag_target, frag_attacker)) // if the target is a flagcarrier
 	{
 		if(autocvar_g_ctf_flagcarrier_auto_helpme_when_damaged > ('1 0 0' * healtharmor_maxdamage(frag_target.health, frag_target.armorvalue, autocvar_g_balance_armor_blockpercent)))
-			WaypointSprite_HelpMePing(frag_target.wps_flagcarrier); // TODO: only do this if there is a significant loss of health?
+			WaypointSprite_HelpMePing(frag_target.wps_flagcarrier);
 	}
 	return FALSE;
 }